|
@@ -126,14 +126,21 @@ func (this *SysDepartmentController) Edit() {
|
|
|
br.Msg = "分组不存在,请刷新重试"
|
|
|
return
|
|
|
}
|
|
|
- count, err = models.GetSysDepartmentCountByName(req.SysDepartmentName)
|
|
|
+ oldSysDepartment, err := models.GetSysDepartmentById(req.SysDepartmentId)
|
|
|
if err != nil && err != orm.ErrNoRows {
|
|
|
br.Msg = "获取数据失败"
|
|
|
br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if count > 0 {
|
|
|
- br.Msg = "名称已存在,请重新输入"
|
|
|
+
|
|
|
+ newSysDepartment, err := models.GetSysDepartmentByName(req.SysDepartmentName)
|
|
|
+ if err != nil && err != orm.ErrNoRows {
|
|
|
+ br.Msg = "获取数据失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if newSysDepartment != nil && newSysDepartment.SysDepartmentId != oldSysDepartment.SysDepartmentId {
|
|
|
+ br.Msg = "分组名称已存在,请重新输入"
|
|
|
return
|
|
|
}
|
|
|
sysDepartment := &models.SysDepartment{}
|