保安筛选逻辑调整

zengh

2021-04-30 3c3378979844bf2f655a5cbac2bd9d57b15479bc

保安筛选逻辑调整

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -52,7 +52,7 @@
     * @param
     * @return
     */
    List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList);
    List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<String> deptIdList);

    /**
     * 获取用户

 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;

@@ -149,8 +146,15 @@

    @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));
//        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