Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...

jiangping

2023-09-21 04c7bc483f55deccb2aeae621a416080fb64fe89

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

@@ -126,20 +126,23 @@
    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());
        List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
        String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode();

        for (SystemUserListVO user : userList) {
            // 查询用户角色列表
            user.setRoles(systemRoleService.findByUserId(user.getId()));
            // 查询用户岗位列表
//            user.setPositions(systemPositionService.findByUserId(user.getId()));
            user.setZhuboRoomUrl(zhuboRoomUrl);
        }
        return PageData.from(new PageInfo<>(userList));
    }
@@ -219,6 +222,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;
    }