修改代码

pz-system/src/main/java/com/pz/system/mapper/SysUserMapper.java

@@ -21,7 +21,7 @@ import java.util.List;
 public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, SysUser> {
 public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, SysUser> {
 
 
     @DataPermission({
     @DataPermission({
-        @DataColumn(key = "deptName", value = "d.dept_id"),
+//        @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.user_id")
         @DataColumn(key = "userName", value = "u.user_id")
     })
     })
     Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
     Page<SysUser> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
@@ -33,7 +33,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      * @return 用户信息集合信息
      * @return 用户信息集合信息
      */
      */
     @DataPermission({
     @DataPermission({
-        @DataColumn(key = "deptName", value = "d.dept_id"),
         @DataColumn(key = "userName", value = "u.user_id")
         @DataColumn(key = "userName", value = "u.user_id")
     })
     })
     List<SysUser> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
     List<SysUser> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java

@@ -106,15 +106,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
             .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
             .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
             .between(params.get("beginTime") != null && params.get("endTime") != null,
-                "u.create_time", params.get("beginTime"), params.get("endTime"))
-            .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
-                List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-                    .select(SysDept::getDeptId)
-                    .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors")));
-                List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
-                ids.add(user.getDeptId());
-                w.in("u.dept_id", ids);
-            });
+                "u.create_time", params.get("beginTime"), params.get("endTime"));
         return wrapper;
         return wrapper;
     }
     }
 
 

pz-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -101,11 +101,8 @@
                u.login_date,
                u.login_date,
                u.create_by,
                u.create_by,
                u.create_time,
                u.create_time,
-               u.remark,
-               d.dept_name,
-               d.leader
+               u.remark
         from sys_user u
         from sys_user u
-                 left join sys_dept d on u.dept_id = d.dept_id
             ${ew.getCustomSqlSegment}
             ${ew.getCustomSqlSegment}
     </select>
     </select>
 
 
@@ -124,12 +121,9 @@
                u.login_date,
                u.login_date,
                u.create_by,
                u.create_by,
                u.create_time,
                u.create_time,
-               u.remark,
-               d.dept_name,
-               d.leader
-        from sys_user u
-                 left join sys_dept d on u.dept_id = d.dept_id
-            ${ew.getCustomSqlSegment}
+               u.remark
+
+        from sys_user u            ${ew.getCustomSqlSegment}
     </select>
     </select>
 
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
     <select id="selectAllocatedList" resultMap="SysUserResult">