优化

MrShi

2024-10-25 78b648fbf1f44061face21fa2511e791ccfbbdc2

 server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java

@@ -13,13 +13,17 @@
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.model.SystemUserRole;
import com.doumee.dao.system.vo.SystemUserListVO;
import com.doumee.service.business.CompanyUserService;
import com.doumee.service.system.SystemRoleService;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;

/**
 * @author T14
@@ -30,6 +34,9 @@
    @Autowired
    private SystemUserJoinMapper systemUserJoinMapper;

    @Autowired
    private SystemRoleService systemRoleService;


    @Override
    public PageData<CompanyUserDTO> findPage(PageWrap<CompanyUserQueryDTO> pageWrap) {
@@ -38,21 +45,29 @@
        MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        mpjJoinMapper.selectAll(SystemUser.class)
                    .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
                    .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
                    .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
                    .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType)
                    .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId)
                    .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId)
                    .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
//                    .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
//                    .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
//                    .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
//                    .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType)
//                    .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId)
//                    .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId)
                    .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                    .eq(SystemUser::getType, Constants.ONE)
                    .eq(SystemUser::getStatus,pageWrap.getModel().getStatus())
                    .like(Company::getName,pageWrap.getModel().getCompanyName())
                    .like(SystemUser::getUsername,pageWrap.getModel().getKeyWords())
                    .or()
                    .like(SystemUser::getRealname,pageWrap.getModel().getKeyWords());
                    .eq(SystemUser::getType, pageWrap.getModel().getType())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),SystemUser::getStatus,pageWrap.getModel().getStatus())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
                    .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),wapper ->{wapper.like(SystemUser::getUsername,pageWrap.getModel().getKeyWords())
                            .or().like(SystemUser::getRealname,pageWrap.getModel().getKeyWords());})
                    .orderByDesc(SystemUser::getCreateTime);

        IPage<CompanyUserDTO> companyUserDTOIPage = systemUserJoinMapper.selectJoinPage(page, CompanyUserDTO.class, mpjJoinMapper);
        if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE) && companyUserDTOIPage.getRecords()!=null){
            for (CompanyUserDTO user : companyUserDTOIPage.getRecords()) {
                // 查询用户角色列表
                user.setRoles(systemRoleService.findByUserId(user.getId()));
            }
        }

        return PageData.from(companyUserDTOIPage);
    }

@@ -60,17 +75,22 @@
    public CompanyUserDTO findOne(CompanyUserDTO companyUserDTO) {
        MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
        mpjJoinMapper.selectAll(SystemUser.class)
                .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
                .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
                .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
                .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType)
                .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId)
                .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId)
                .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
//                .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
//                .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
//                .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
//                .selectAs(SystemRole::getType,CompanyUserDTO::getRoleType)
//                .leftJoin(SystemUserRole.class,SystemUserRole::getUserId,SystemUser::getId)
//                .leftJoin(SystemRole.class,SystemRole::getId,SystemUserRole::getRoleId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(SystemUser::getType, Constants.ONE)
                .eq(SystemUser::getId,companyUserDTO.getId());

        CompanyUserDTO companyUserDTOIPage = systemUserJoinMapper.selectJoinOne(CompanyUserDTO.class, mpjJoinMapper);
        if(companyUserDTOIPage!=null && Constants.equalsInteger(companyUserDTOIPage.getType(),Constants.ONE) ){
                // 查询用户角色列表
            companyUserDTOIPage.setRoles(systemRoleService.findByUserId(companyUserDTOIPage.getId()));
        }
        return companyUserDTOIPage;
    }

@@ -78,6 +98,7 @@
    public List<CompanyUserDTO> findListByCompanyID(CompanyUserDTO companyUserDTO) {
        MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
        mpjJoinMapper.selectAll(SystemUser.class)
                .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
                .selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
                .selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
                .selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)