From 6df3edd683527a60315cd0ecd511ff92cf0f8eed Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Dec 2022 11:48:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?64510=20=E3=80=90=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E3=80=91=E4=B8=8A=E6=8A=A5=E5=BA=93--=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E5=B1=95=E7=A4=BA=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 5c560eb87..15d3aac78 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -594,7 +594,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Thu, 29 Dec 2022 13:45:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?64493=20=E7=BC=96=E8=BE=91=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryBaseServiceImpl.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 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 2a9df4dad..45e9778aa 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 @@ -438,18 +438,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl delWrapper = new QueryWrapper<>(); - delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id). - eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue()); - projectUserPermissionService.remove(delWrapper); - //如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限 - QueryWrapper delLawInventoryWrapper = new QueryWrapper<>(); - delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id). - eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue()); - projectUserPermissionService.remove(delLawInventoryWrapper); + if(StringUtils.isNotEmpty(original.getCertificationEngineer())){ + for (String id : original.getCertificationEngineer().split(",")) { + if (!certificationEngineer.contains(id)) { + //如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限 + QueryWrapper delWrapper = new QueryWrapper<>(); + delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id). + eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue()); + projectUserPermissionService.remove(delWrapper); + //如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限 + QueryWrapper delLawInventoryWrapper = new QueryWrapper<>(); + delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id). + eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue()); + projectUserPermissionService.remove(delLawInventoryWrapper); + } } } From daf9a5483c4bdc2738719ba359c6fd0c61a3fa8f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Dec 2022 13:48:32 +0800 Subject: [PATCH 3/5] update --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 2e243e104..9b923d513 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1160,6 +1160,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 29 Dec 2022 14:46:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=8D=E5=81=9A=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index e7692c4c6..e20bfa87c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -252,17 +252,16 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //下面注释掉的代码，是用于区分权限的，2022-12-29变更的时候注释掉的，后面如果要是需要添加权限的时候，再将一下注释的几行代码放开即可----------------------------------- //系统管理 - boolean administrator = sysUserService.isAdministrator(); - if(!administrator){ - queryWrapper.and(query->{ - query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()) - .or().in("state",InventoryStateEnum.ISSUE.getValue()); - }); - } -// queryWrapper.or(query->{ -// query.in("state",InventoryStateEnum.ISSUE.getValue()); -// }); +// boolean administrator = sysUserService.isAdministrator(); +// if(!administrator){ +// queryWrapper.and(query->{ +// query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()) +// .or().in("state",InventoryStateEnum.ISSUE.getValue()); +// }); +// } + //-------------------------------------------------------------------------------------------------------------------------------------------------- IPage pageList = this.page(page, queryWrapper); if (pageList.getRecords().size() != 0) { List records = pageList.getRecords(); From b574bd6ac7822558c0bbe1a943957bd63be21661 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Dec 2022 15:20:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?64523=E3=80=8164518bug=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9b923d513..af66d076a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1232,6 +1232,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVO : paramsConfigDataVOList) { @@ -5397,7 +5400,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); - for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) { + /*for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) { StringBuilder referencesColBuilder = new StringBuilder(); if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) { referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#"); @@ -5429,6 +5432,55 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl manifestUpdateWrap = new LambdaUpdateWrapper<>(); + manifestUpdateWrap.eq(ParamsCollectManifestEO::getId,paramsCollectManifestEO.getId()); + manifestUpdateWrap.set(ParamsCollectManifestEO::getReferencesCol,null); + this.update(manifestUpdateWrap); + } } // 修改参数清单的参考列名称