Merge remote-tracking branch 'origin/master'

linwei

2024-02-22 1ae132711061edcdc190edfca383612bd13e1688

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

@@ -213,7 +213,7 @@

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