diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index a2e713672..b32f22693 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); } // List sysUserList = sysUserService.list(); - QueryWrapper userQueryWrapper = new QueryWrapper<>(); - userQueryWrapper.select("id", "username"); - List sysUserList = this.sysUserService.list(userQueryWrapper); + ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue()); ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue()); @@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl verifyName = "Verify conformance validation"; } List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + Set userIdSet = new HashSet<>(); + for (NcrTrackVO trackVO : infoList) { + if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){ + userIdSet.add(trackVO.getDesignInitiatorId()); + } + if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){ + userIdSet.add(trackVO.getPrehomoInitiatorId()); + } + if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){ + userIdSet.add(trackVO.getVerifyInitiatorId()); + } + } + List sysUserList = new ArrayList<>(); + if(userIdSet.size() != 0){ + QueryWrapper userQueryWrapper = new QueryWrapper<>(); + userQueryWrapper.lambda().in(SysUser::getId,userIdSet); + userQueryWrapper.select("id", "username"); + sysUserList = this.sysUserService.list(userQueryWrapper); + } for (NcrTrackVO trackVO : infoList) { //责任领域中英文切换 if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){