From 1498aa1490bb4f124650b0b6c314d725acb56669 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 11 May 2022 08:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectRelatedPersonnelServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 81d4990ce..99c553c6e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -266,10 +266,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> certificationEngineerList = new ArrayList<>(); List> engineeringInterfacePersonList = new ArrayList<>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectId); - queryWrapper.lambda().in(ProjectRelatedPersonnel::getDutyTerritory,Arrays.asList(dutyTerritory.split(","))); - List projectRelatedPersonnels = this.baseMapper.selectList(queryWrapper); + List projectRelatedPersonnels = new ArrayList<>(); + if(StringUtils.isNotBlank(dutyTerritory)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectId); + queryWrapper.lambda().in(ProjectRelatedPersonnel::getDutyTerritory,Arrays.asList(dutyTerritory.split(","))); + projectRelatedPersonnels = this.baseMapper.selectList(queryWrapper); + } + if(CollectionUtils.isNotEmpty(projectRelatedPersonnels)){ List userIdList = new ArrayList<>();