|
@@ -1034,17 +1034,17 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
|
1034
|
1034
|
|
1035
|
1035
|
func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
|
1036
|
1036
|
|
1037
|
|
- err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
|
|
1037
|
+ err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
|
1038
|
1038
|
return err
|
1039
|
1039
|
}
|
1040
|
1040
|
|
1041
|
1041
|
func SaveSex(id int64, role *models.SgjUserAdminRole) error {
|
1042
|
|
- err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
|
|
1042
|
+ err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
|
1043
|
1043
|
return err
|
1044
|
1044
|
}
|
1045
|
1045
|
|
1046
|
1046
|
func SaveBirthday(id int64, role *models.SgjUserAdminRole) error {
|
1047
|
|
- err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
|
|
1047
|
+ err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
|
1048
|
1048
|
return err
|
1049
|
1049
|
}
|
1050
|
1050
|
|
|
@@ -1161,9 +1161,9 @@ func GetBloodPatient(orgid int64) (patients []*models.XtPatientsNew, err error)
|
1161
|
1161
|
return patients, err
|
1162
|
1162
|
}
|
1163
|
1163
|
|
1164
|
|
-func SaveName(id int64, role *models.SgjUserAdminRole) error {
|
|
1164
|
+func SaveName(id int64, admin *models.SgjUserAdmin) error {
|
1165
|
1165
|
|
1166
|
|
- err = UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id=?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
|
|
1166
|
+ err = UserWriteDB().Model(models.SgjUserAdmin{}).Where("id=?", id).Update(map[string]interface{}{"name": admin.Name, "mtime": time.Now().Unix()}).Error
|
1167
|
1167
|
return err
|
1168
|
1168
|
}
|
1169
|
1169
|
|
|
@@ -1229,9 +1229,14 @@ func GetMyInfoName(id int64) (models.SgjUserAdminRole, error) {
|
1229
|
1229
|
return role, err
|
1230
|
1230
|
}
|
1231
|
1231
|
|
1232
|
|
-func GetAdminName(id int64) (models.AdminUser, error) {
|
1233
|
|
- user := models.AdminUser{}
|
1234
|
|
- err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
|
|
1232
|
+func GetAdminName(id int64) (models.AdminUsers, error) {
|
|
1233
|
+ user := models.AdminUsers{}
|
|
1234
|
+ //err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
|
|
1235
|
+ //return user, err
|
|
1236
|
+ db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
|
|
1237
|
+ table := UserReadDB().Table("sgj_user_admin_role as r")
|
|
1238
|
+ fmt.Println("table", table)
|
|
1239
|
+ err := db.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
|
1235
|
1240
|
return user, err
|
1236
|
1241
|
}
|
1237
|
1242
|
|
|
@@ -1297,3 +1302,22 @@ func GetPosition(id int64) (models.SgjUserAdminRole, error) {
|
1297
|
1302
|
err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
|
1298
|
1303
|
return roles, err
|
1299
|
1304
|
}
|
|
1305
|
+
|
|
1306
|
+func GetPositionOne(id int64) (models.SgjUserAdmin, error) {
|
|
1307
|
+
|
|
1308
|
+ admin := models.SgjUserAdmin{}
|
|
1309
|
+ err = UserReadDB().Model(&admin).Where("id=? and status = 1", id).Find(&admin).Error
|
|
1310
|
+ return admin, err
|
|
1311
|
+}
|
|
1312
|
+
|
|
1313
|
+func GetMyOrgInformation(id int64) (models.SgjUserAdminRole, error) {
|
|
1314
|
+ admin := models.SgjUserAdminRole{}
|
|
1315
|
+ err := UserReadDB().Model(&admin).Where("admin_user_id=? and status = 1", id).Find(&admin).Error
|
|
1316
|
+ return admin, err
|
|
1317
|
+}
|
|
1318
|
+
|
|
1319
|
+func SaveNameTwo(id int64, role *models.SgjUserAdminRole) error {
|
|
1320
|
+
|
|
1321
|
+ err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
|
|
1322
|
+ return err
|
|
1323
|
+}
|