From 92f959ccd8c05f953166ec140d2de0a7e9cfa6a5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 17 Aug 2022 13:38:44 +0800 Subject: [PATCH] update --- .../service/impl/ConditionAssessmentEOServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index b274dea1a..8f87663db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -98,6 +98,12 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); List conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(conditionAssessmentEOS)){ + //根据角色编码去重。 + conditionAssessmentEOS = conditionAssessmentEOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> o.getRoleCode()))), + ArrayList::new)); + } return conditionAssessmentEOS; } @@ -150,9 +156,9 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); - if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ + /*if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess()); - } + }*/ if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername());