提交

MrShi

2025-06-04 ff9a67152b544813a4b065e18146bcd121b4e54a

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

@@ -13,6 +13,8 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.business.CompanyDepartmentMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
@@ -180,29 +182,25 @@
    @Override
    public PageData<SystemUserListVO> findPageCompany(PageWrap<QuerySystemUserDTO> pageWrap) {
        // 根部门条件处理（需查询根部门下所有部门的用户）
        if (pageWrap.getModel().getRootDeptId() != null) {
//            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);
        }
        if (pageWrap.getModel().getCompanyId() == null) {
            pageWrap.getModel().setCompanyId(-1);
        }
        IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setType(Constants.UserType.COMPANY.getKey());//查询企业类型
        // 执行查询
        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));
        MPJLambdaWrapper<SystemUser> wrapper = new MPJLambdaWrapper<>();
        wrapper .selectAll(SystemUser.class)
                .select("(select count(distinct(a.company_id) from company_permisson a where a.user_id=t.id and a.ideleted=0 and a.type=1)",SystemUser::getAuthNum)
                .selectAs(Company::getName,SystemUser::getCompanyName)
                .selectAs(CompanyDepartment::getName,SystemUser::getDepartmentName)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .leftJoin(CompanyDepartment.class,CompanyDepartment::getId,SystemUser::getDepartmentId)
                .eq( pageWrap.getModel().getDepartmentId() !=null,SystemUser::getDepartmentId, pageWrap.getModel().getDepartmentId())
                .eq( pageWrap.getModel().getStatus() !=null,SystemUser::getStatus, pageWrap.getModel().getStatus())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getMobile()),SystemUser::getMobile, pageWrap.getModel().getMobile())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getRealname()),SystemUser::getRealname, pageWrap.getModel().getRealname())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),SystemUser::getUsername, pageWrap.getModel().getUsername())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),SystemUser::getCompanyName, pageWrap.getModel().getCompanyName());
        IPage<SystemUserListVO> result =  systemUserMapper.selectJoinPage(page,SystemUserListVO.class,wrapper);
        return  PageData.from(result);
    }

    @Override
@@ -271,14 +269,12 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(SystemUser.class);
        queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
        .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),
                ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
                    .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
                .or().like(SystemUser::getRealname,pageWrap.getModel().getUsername())
        );
        queryWrapper.orderByDesc(SystemUser::getCreateTime);



        IPage<SystemUser> result = systemUserJoinMapper.selectJoinPage(page, SystemUser.class, queryWrapper);

        return PageData.from(result);