Merge branch 'dev-api' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -78,7 +78,7 @@ public class SysDeptController extends BaseController
     {
         if (!deptService.checkDeptNameUnique(dept))
         {
-            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return error("新增组织'" + dept.getDeptName() + "'失败，组织名称已存在");
         }
         dept.setCreateBy(getUsername());
         return toAjax(deptService.insertDept(dept));
@@ -96,15 +96,15 @@ public class SysDeptController extends BaseController
         deptService.checkDeptDataScope(deptId);
         if (!deptService.checkDeptNameUnique(dept))
         {
-            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return error("修改组织'" + dept.getDeptName() + "'失败，组织名称已存在");
         }
         else if (dept.getParentId().equals(deptId))
         {
-            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            return error("修改组织'" + dept.getDeptName() + "'失败，上级组织不能是自己");
         }
         else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
         {
-            return error("该部门包含未停用的子部门！");
+            return error("该组织包含未停用的子组织！");
         }
         dept.setUpdateBy(getUsername());
         return toAjax(deptService.updateDept(dept));

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/StudentController.java

@@ -2,6 +2,7 @@ package com.ruoyi.sim.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -67,6 +68,14 @@ public class StudentController extends BaseController {
     public AjaxResult add(@Validated @RequestBody SysUser user) {
         deptService.checkDeptDataScope(user.getDeptId());
         roleService.checkRoleDataScope(user.getRoleIds());
+        // --------------------------------  --------------------------------
+        {
+            AjaxResult arCheck = checkAddOrEdit(user);
+            if (arCheck != null) {
+                return arCheck;
+            }
+        }
+        // --------------------------------  --------------------------------
         if (!userService.checkUserNameUnique(user)) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
@@ -74,6 +83,7 @@ public class StudentController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
+
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         AjaxResult tempAjax = toAjax(userService.insertUser(user));
@@ -99,6 +109,14 @@ public class StudentController extends BaseController {
         userService.checkUserDataScope(user.getUserId());
         deptService.checkDeptDataScope(user.getDeptId());
         roleService.checkRoleDataScope(user.getRoleIds());
+        // --------------------------------  --------------------------------
+        {
+            AjaxResult arCheck = checkAddOrEdit(user);
+            if (arCheck != null) {
+                return arCheck;
+            }
+        }
+        // --------------------------------  --------------------------------
         if (!userService.checkUserNameUnique(user)) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
@@ -113,6 +131,19 @@ public class StudentController extends BaseController {
         return tempAjax;
     }
 
+    public AjaxResult checkAddOrEdit(SysUser su) {
+        if (su == null) {
+            return AjaxResult.error("SysUser is null!");
+        }
+        SysDept d = deptService.selectDeptById(su.getDeptId());
+        String an = d.getAncestors();
+        String[] anArr = an.split(",");
+        if (anArr.length != 5) {
+            return AjaxResult.error("请选择区队作为学员组织!");
+        }
+        return null;
+    }
+
     /**
      * 删除学生
      */