更新代码

conf/app.conf

@@ -148,28 +148,28 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
-//readmysqlname = sgj_xt
+//readmysqlname = test_xt
+readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
-//writemysqlname = sgj_xt
+//writemysqlname = test_xt
+writemysqlname = sgj_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = test_users
+readusername = sgj_users
 //readusername = test_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = test_users
+writeusername = sgj_users
 //writeusername = test_users
 
 

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -18,9 +18,8 @@ type AdminUserApiController struct {
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
-
+	orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, orgId.Creator)
 	if es != nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"state":                1,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1701,8 +1701,10 @@ func (this *NewDialysisApiController) SaveMessage() {
 	fmt.Println("id", id)
 	message := this.GetString("message")
 	fmt.Println("message", message)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		Message: message,
+		OrgId:   orgid,
 	}
 	err := service.SaveMessage(id, &role)
 	if err != nil {
@@ -1719,8 +1721,10 @@ func (this *NewDialysisApiController) SaveSex() {
 	fmt.Println("sex", sex)
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
-		Sex: sex,
+		Sex:   sex,
+		OrgId: orgid,
 	}
 	err := service.SaveSex(id, &role)
 	if err != nil {
@@ -1743,8 +1747,11 @@ func (this *NewDialysisApiController) SaveBirthday() {
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
 	birth := theTime.Unix()
+	orgid := dataBody["orgid"].(string)
+	orgids, err := strconv.ParseInt(orgid, 10, 64)
 	role := models.SgjUserAdminRole{
 		Birthday: birth,
+		OrgId:    orgids,
 	}
 	err = service.SaveBirthday(ids, &role)
 	if err != nil {
@@ -2207,7 +2214,8 @@ func (this *NewDialysisApiController) EditOrg() {
 
 func (this *NewDialysisApiController) GetMyInforName() {
 	id, _ := this.GetInt64("id")
-	Username, err := service.GetAdminName(id)
+	orgid, _ := this.GetInt64("orgid")
+	Username, err := service.GetAdminName(id, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2219,11 +2227,16 @@ func (this *NewDialysisApiController) GetMyInforName() {
 
 func (this *NewDialysisApiController) GetMyInformationFour() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	creatId := adminUserInfo.AdminUser.Id
-	fmt.Println("创建者ID", creatId)
+	//creatId := adminUserInfo.AdminUser.Id
+	//fmt.Println("创建者ID", creatId)
 	orgid := adminUserInfo.Org.Id
+	//跟剧机构ID获取创建者ID
 	fmt.Println("orgid", orgid)
-	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
+	OrgId, _ := service.GetCreatByOrgId(orgid)
+	fmt.Println("创建者ID", OrgId.Creator)
+
+	fmt.Println("当前机构ID信息---------------------", orgid)
+	Username, err := service.GetMyOrgInformationFour(OrgId.Creator, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

service/patientmanage_service.go

@@ -1250,17 +1250,23 @@ func GetMyInfoName(id int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
-func GetAdminName(id int64) (models.AdminUsers, error) {
+func GetAdminName(id int64, orgid int64) (models.AdminUsers, error) {
 	user := models.AdminUsers{}
 	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
 	//return user, err
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
-	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
+	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id and r.org_id = ?", orgid).Scan(&user).Error
 	return user, err
 }
 
+func GetCreatByOrgId(orgid int64) (models.SgjUserOrg, error) {
+	org := models.SgjUserOrg{}
+	err := UserReadDB().Model(&org).Where("id=? and status = 1", orgid).Find(&org).Error
+	return org, err
+}
+
 func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
 	role := models.SgjUserAdminRole{}
 	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error