押金管理bug修改

controllers/his_deposit_controller.go

@@ -504,7 +504,7 @@ func (this *HisDepositApiController) GetUserList() {
 //扣费明细查询
 func (this *HisDepositApiController) DeductionDetails() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
-	orgid = 9675
+	//orgid = 9675
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	keyword := this.GetString("keyword")

controllers/role_controller.go

@@ -1211,6 +1211,7 @@ func (this *RoleAPIController) EditAdmin() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
 		return
 	}
+	appRole.OrgId = this.GetAdminUserInfo().CurrentOrgId
 	appRole.Department = department
 	appRole.DepartmentId = department_id
 	appRole.UserName = name
@@ -1255,6 +1256,8 @@ func (this *RoleAPIController) EditAdmin() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 
 	} else {
+		//判断当前角色是否为机构管理员
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"approle": appRole,
 		})

service/role_service.go

@@ -279,6 +279,21 @@ func SaveAppRole(appRole *models.App_Role) error {
 		tx.Rollback()
 		return err
 	}
+	var tmp models.Org
+	//根据机构id查询管理员id
+	tx.Model(&models.Org{}).Where("status = 1 and id = ?", appRole.OrgId).Find(&tmp)
+	//如果相等则修改管理员的姓名
+	if tmp.Creator == appRole.AdminUserId {
+		err = tx.Model(&models.AdminUser{}).Where("id = ?", appRole.AdminUserId).Updates(map[string]interface{}{
+			"mtime": time.Now().Unix(),
+			"name":  appRole.UserName,
+		}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
 	return tx.Commit().Error
 }