pp

jiangping

2023-09-20 c166834a4aa5545a30115ea0195dab8dbab59fbd

 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -126,11 +126,11 @@
    public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
        // 根部门条件处理（需查询根部门下所有部门的用户）
        if (pageWrap.getModel().getRootDeptId() != null) {
            pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
//            pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
        } else {
            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
            pageWrap.getModel().setDepartmentIds(collect);
//            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
//            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
//            pageWrap.getModel().setDepartmentIds(collect);
        }
        // 执行查询
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
@@ -219,6 +219,20 @@
    }


    @Override
    public List<SystemUser> findAllList(SystemUser pageWrap){
        MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO)
                    .eq(SystemUser::getType,pageWrap.getType());
        queryWrapper.orderByDesc(SystemUser::getCreateTime);
        List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper);

        return result;
    }