作者 tangxvhui

bug 修复

@@ -103,12 +103,23 @@ func UpdateDepartmentData(data ModuleDeparmentData) error { @@ -103,12 +103,23 @@ func UpdateDepartmentData(data ModuleDeparmentData) error {
103 return errors.New("获取部门数据失败") 103 return errors.New("获取部门数据失败")
104 } 104 }
105 departmentData.Name = data.Name 105 departmentData.Name = data.Name
106 - err = models.UpdateDepartmentById(departmentData, []string{"Name"}) 106 + o := orm.NewOrm()
  107 + o.Begin()
  108 + err = models.UpdateDepartmentById(departmentData, []string{"Name"}, o)
107 if err != nil { 109 if err != nil {
  110 + o.Rollback()
108 e := fmt.Errorf("更新部门数据失败,err:%s", err) 111 e := fmt.Errorf("更新部门数据失败,err:%s", err)
109 log.Error(e.Error()) 112 log.Error(e.Error())
110 return errors.New("更新部门数据失败") 113 return errors.New("更新部门数据失败")
111 } 114 }
  115 + //更新部门管理员
  116 + err = models.ChangeDepartmentCharge(data.Id, departmentData.Id, data.Charge, o)
  117 + if err != nil {
  118 + o.Rollback()
  119 + log.Error("变更公司管理员失败,err:%s", err)
  120 + return errors.New("变更公司管理员失败")
  121 + }
  122 + o.Commit()
112 var ( 123 var (
113 newParentDepart *models.Department 124 newParentDepart *models.Department
114 ) 125 )
@@ -124,6 +135,7 @@ func UpdateDepartmentData(data ModuleDeparmentData) error { @@ -124,6 +135,7 @@ func UpdateDepartmentData(data ModuleDeparmentData) error {
124 log.Error("获取父级数据失败,business_admin_id=%d,err:%s", data.ParentId, err) 135 log.Error("获取父级数据失败,business_admin_id=%d,err:%s", data.ParentId, err)
125 } 136 }
126 } 137 }
  138 +
127 if departmentData.ParentId != newParentDepart.Id { 139 if departmentData.ParentId != newParentDepart.Id {
128 //更新父级 140 //更新父级
129 err = departmentRelationUpdate(*departmentData, *newParentDepart) 141 err = departmentRelationUpdate(*departmentData, *newParentDepart)