fix: 部门角色

controllers/sys_department.go

@@ -65,6 +65,7 @@ func (this *SysDepartmentController) Add() {
 		br.Msg = "部门名称不能为空"
 		return
 	}
+	// 这里实际没有传多个部门，不知道为啥要这么写...=_=!
 	for _, dep := range req.SysDepartmentNames {
 		count, err := models.GetSysDepartmentCountByParentId(req.SysDepartmentId, dep)
 		if err != nil {
@@ -72,17 +73,19 @@ func (this *SysDepartmentController) Add() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		if count <= 0 {
-			sysDepartment := &models.SysDepartment{}
-			sysDepartment.SysDepartmentName = dep
-			sysDepartment.Level = req.Level
-			sysDepartment.ParentId = req.SysDepartmentId
-			err = sysDepartment.Add()
-			if err != nil {
-				br.Msg = "新增失败"
-				br.ErrMsg = "新增失败，Err:" + err.Error()
-				return
-			}
+		if count > 0 {
+			br.Msg = "部门名称已存在"
+			return
+		}
+		sysDepartment := &models.SysDepartment{}
+		sysDepartment.SysDepartmentName = dep
+		sysDepartment.Level = req.Level
+		sysDepartment.ParentId = req.SysDepartmentId
+		err = sysDepartment.Add()
+		if err != nil {
+			br.Msg = "新增失败"
+			br.ErrMsg = "新增失败，Err:" + err.Error()
+			return
 		}
 	}
 

controllers/sys_role.go

@@ -227,7 +227,7 @@ func (this *SysRoleController) Edit() {
 		return
 	}
 	if req.SysRoleName == "" {
-		br.Msg = "分组名称不能为空"
+		br.Msg = "角色名称不能为空"
 		return
 	}
 

controllers/sys_user.go

@@ -230,6 +230,10 @@ func (this *SysUserController) Edit() {
 		br.ErrMsg = "角色ID小于等于0"
 		return
 	}
+	if req.SysDepartmentId <= 0 {
+		br.Msg = "请选择部门"
+		return
+	}
 
 	sysUser, err := models.GetSysUserById(req.SysUserId)
 	if err != nil {
@@ -272,6 +276,31 @@ func (this *SysUserController) Edit() {
 		}
 	}
 
+	// 部门
+	depPathIds, err := services.GetSysDepartmentPathIdsById(req.SysDepartmentId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获得分组路径失败，系统错误，Err:" + err.Error()
+		return
+	}
+	switch len(depPathIds) {
+	case 1:
+		sysUser.SysDepartmentId = depPathIds[0]
+		sysUser.SysDepartmentId1 = depPathIds[0]
+	case 2:
+		sysUser.SysDepartmentId = depPathIds[1]
+		sysUser.SysDepartmentId1 = depPathIds[0]
+		sysUser.SysDepartmentId2 = depPathIds[1]
+	case 3:
+		sysUser.SysDepartmentId = depPathIds[2]
+		sysUser.SysDepartmentId1 = depPathIds[0]
+		sysUser.SysDepartmentId2 = depPathIds[1]
+		sysUser.SysDepartmentId3 = depPathIds[2]
+	default:
+		br.Msg = "部门有误"
+		return
+	}
+
 	var roleName string
 	roleItem, err := models.GetSysRoleById(req.SysRoleId)
 	if err != nil {