保安筛选逻辑调整

zengh

2021-05-07 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84

 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -53,10 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.*;

import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;

@@ -143,13 +140,21 @@
   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
      List<User> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
      return page.setRecords(users);
   }

   @Override
   public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList));
   public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
//      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      if (deptId != null){
         String arr =deptId.toString();
         List<String> array = Arrays.asList(arr.split(","));
         return page.setRecords(baseMapper.selectUserPages(page, user, array));
      }else{
         return page.setRecords(baseMapper.selectUserPages(page, user, null));
      }

   }

   @Override
@@ -313,6 +318,7 @@

   @Override
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {

      List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
      userList.forEach(user -> {
         user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));