From 69c65dda53f5fa7007130e6a7339666b5b5ef52a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 13:39:06 +0800
Subject: [PATCH] 休bug
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
index fb23b03..e82e992 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyUserServiceImpl.java
@@ -16,10 +16,12 @@
import com.doumee.service.business.CompanyUserService;
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
@@ -38,6 +40,7 @@
MPJLambdaWrapper<SystemUser> mpjJoinMapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
mpjJoinMapper.selectAll(SystemUser.class)
+ .selectAs(Company::getName,CompanyUserDTO::getCompanyName)
.selectAs(SystemRole::getId,CompanyUserDTO::getRoleId)
.selectAs(SystemRole::getCode,CompanyUserDTO::getRoleCode)
.selectAs(SystemRole::getName,CompanyUserDTO::getRoleName)
@@ -45,12 +48,12 @@
.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())
+ .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())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),SystemUser::getUsername,pageWrap.getModel().getKeyWords())
.or()
- .like(SystemUser::getRealname,pageWrap.getModel().getKeyWords());
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),SystemUser::getRealname,pageWrap.getModel().getKeyWords());
IPage<CompanyUserDTO> companyUserDTOIPage = systemUserJoinMapper.selectJoinPage(page, CompanyUserDTO.class, mpjJoinMapper);
return PageData.from(companyUserDTOIPage);
@@ -60,6 +63,7 @@
public CompanyUserDTO findOne(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)
@@ -78,6 +82,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)
--
Gitblit v1.9.3