0206

src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

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

src/main/java/cn/ezhizao/project/system/controller/SysRoleController.java

@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 角色信息
@@ -215,7 +216,8 @@ public class SysRoleController extends BaseController
         user.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
-        return getDataTable(list);
+        List<SysUser> newList = list.stream().filter(item -> item.getUserId()!=1 && item.getUserId()!=2).collect(Collectors.toList());
+        return getDataTable(newList);
     }
 
     /**

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -85,7 +85,8 @@ public class SysUserController extends BaseController {
     public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         List<SysUser> userList = userService.listByLikeNickNameOrUserName(user);
-        return getDataTable(userList);
+        List<SysUser> list = userList.stream().filter(item -> item.getUserId() !=1 && item.getUserId() !=2).collect(Collectors.toList());
+        return getDataTable(list);
     }
 
     @GetMapping("/listEmployee")

src/main/java/cn/ezhizao/project/system/mapper/SysDeptMapper.java

@@ -85,14 +85,14 @@ public interface SysDeptMapper {
      */
     public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId,@Param("tenantId") Long tenantId);
 
-    /**
-     * 校验部门名称是否唯一
+  /**
+     * 校验部门编码是否唯一
      *
-     * @param deptName 部门名称
+     * @param deptCode 部门编码
      * @param parentId 父部门ID
      * @return 结果
      */
-    public SysDept checkDeptCodeUnique(@Param("deptCode") String deptName, @Param("parentId") Long parentId);
+    public SysDept checkDeptCodeUnique(@Param("deptCode") String deptCode, @Param("parentId") Long parentId,@Param("tenantId") Long tenantId);
 
 
     /**

src/main/java/cn/ezhizao/project/system/service/ISysDeptService.java

@@ -92,7 +92,6 @@ public interface ISysDeptService
      * @return 结果
      */
     public String checkDeptNameUnique(SysDept dept);
-
     /**
      * 校验统一社会信用编码是否唯一
      *

src/main/java/cn/ezhizao/project/system/service/impl/SysDeptServiceImpl.java

@@ -205,7 +205,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     public String checkDeptCodeUnique(SysDept dept)
     {
         Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = deptMapper.checkDeptCodeUnique(dept.getDeptCode(), dept.getParentId());
+        SysDept info = deptMapper.checkDeptCodeUnique(dept.getDeptCode(), dept.getParentId(),dept.getTenantId());
         if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -121,10 +121,9 @@
 		<include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' and tenant_id = #{tenantId} limit 1
 	</select>
-
 	<select id="checkDeptCodeUnique" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
-		where dept_code=#{deptCode} and parent_id = #{parentId} and del_flag = '0' limit 1
+		where dept_code=#{deptCode} and parent_id = #{parentId} and del_flag = '0' and tenant_id = #{tenantId} limit 1
 	</select>
 
 	<select id="getRootParentId" parameterType="Long">