Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

@@ -138,9 +138,8 @@
   }

   @Override
   public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
   public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
      return page.setRecords(baseMapper.selectUserPages(page, user));
   }

   @Override
@@ -518,4 +517,10 @@
   public UserVO getUserAgeById(Long userId) {
      return baseMapper.getUserAgeById(userId);
   }

   @Override
   public List<Map<String, Object>> selectUser() {
      return baseMapper.selectUser();
   }

}