Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -141,6 +141,9 @@

   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
      if (null == deptId && !AuthUtil.isAdministrator()){
         deptId = Long.parseLong(AuthUtil.getDeptId());
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
   }