From d8c29874803bb93d7e3494e7eaba2b7daccaf135 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 10:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCertificationDirectoryEOServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java index c89a02088..f30894f6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java @@ -156,10 +156,18 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl inventoryEOQueryWrapperRZ = new QueryWrapper<>(); + /*QueryWrapper inventoryEOQueryWrapperRZ = new QueryWrapper<>(); inventoryEOQueryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); inventoryEOQueryWrapperRZ.lambda().eq(ProjectLawsInventoryEO::getHomologationEngineerId,currentUser.getId()); - Integer lawsInventoryCountRZ = projectLawsInventoryEOMapper.selectCount(inventoryEOQueryWrapperRZ); + Integer lawsInventoryCountRZ = projectLawsInventoryEOMapper.selectCount(inventoryEOQueryWrapperRZ);*/ + // 2023-03-24 修改，由于将认证工程师 挪到了 项目库详情信息中，法规清单中没有认证工程师信息了。 + ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectById(projectLibraryId); + Integer lawsInventoryCountRZ = 0; + if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){ + if(StringUtils.contains(projectLibraryBase.getCertificationEngineer(),currentUser.getId())){ + lawsInventoryCountRZ = 1; + } + } if(lawsInventoryCountRZ > 0){ result = Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); return result;