zhongrj
2023-05-25 18c6b5131991b02e4a473ae0622d9eca7b417bb4
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
@@ -141,9 +141,22 @@
      return userDeptService.saveBatch(userDeptList);
   }
   /**
    * 自定义分页查询
    * @param page
    * @param user
    * @param deptId
    * @param tenantId
    * @return
    */
   @Override
   public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      List<Long> deptIdList = new ArrayList<>();
      if (null!=user.getIsDept()) {
         deptIdList.add(deptId);
      }else {
         deptIdList = SysCache.getDeptChildIds(deptId);
      }
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
   }