From 2cd835eb9bb768bfe9a3d38bbef75c3366369722 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 27 Sep 2023 15:23:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 624172269..e7288fcd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1286,12 +1286,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(","))); + wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(","))); List lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1); //平台件项目信息 List projectLibraryBaseList = new ArrayList<>(); - if(!lawsInventoryEOList.isEmpty()){ + if(!lawsInventoryEOList.isEmpty() && ObjectUtils.isNotEmpty(lawsInventoryEOS)){ List projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); wrapper2.in(ProjectLibraryBase::getId,projectIdList); From 4a868e3708d0db71b769348b6e657982d9b6d5b3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 27 Sep 2023 15:29:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/service/impl/OtaManageApplyEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 3d5ba5b49..b13b6f95c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -1832,7 +1832,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List plbEoList) { List> result = new ArrayList<>(); List projectLibraryBaseList = new ArrayList<>(); - if (!plbEoList.isEmpty()) { + if (ObjectUtils.isNotEmpty(plbEoList)) { projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList()); } List receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch); From 5892bbc79f69334ac40ec9476f4f8b16c5c4ceb7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 27 Sep 2023 15:45:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...formProjectLawsInventoryEOServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 0169059a1..412ed239c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -3955,16 +3955,16 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { - q.eq("regulation_owner_id", currentUser.getId()). - or().eq("homologation_engineer_id", currentUser.getId()); - }); - } +// int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode()); +// if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()) +// && isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue()) +// && isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) { +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// queryWrapper.and(q -> { +// q.eq("regulation_owner_id", currentUser.getId()). +// or().eq("homologation_engineer_id", currentUser.getId()); +// }); +// } //导出的数据 dataList = this.list(queryWrapper);