From 45c07abab3d161429e370ae3bd0743e496fa3c08 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 3 Apr 2023 11:03:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=20=20=20=E7=BC=96?= =?UTF-8?q?=E8=BE=91/=E6=B7=BB=E5=8A=A0=E6=97=B6=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=20=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E6=98=AF=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E4=B8=AD=E7=9A=843=E5=88=97?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 4de2a9337..ac746250e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> lawEngineerList = new ArrayList<>(); List> certificationEngineerList = new ArrayList<>(); List> engineeringInterfacePersonList = new ArrayList<>(); + List> studioPersonList = new ArrayList<>(); //项目的studio用户 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl sysUserList = new ArrayList<>(); @@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("name",sysUser.getUsername()); + map.put("value",sysUser.getId()); + engineeringInterfacePersonList.add(map); + } + } + } + } + if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){ + String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(","); + for (String engineerAttSet : engineerAttSetArr) { + for (SysUser sysUser : sysUserList) { + if(StringUtils.equals(engineerAttSet,sysUser.getId())){ + Map map = new HashMap<>(); + map.put("name",sysUser.getUsername()); + map.put("value",sysUser.getId()); + engineeringInterfacePersonList.add(map); + } + } + } + } + if (StringUtils.isNotBlank(studioEngineer)) { for (SysUser sysUser : sysUserList) { if (StringUtils.equals(studioEngineer, sysUser.getId())) { From b8aacc21d7b97db66770426f87b68447c33ce4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:21:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88-=E7=94=A8=E6=88=B7=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=8A=E6=96=B9=E5=BC=8F-=E8=A1=A8?= =?UTF-8?q?=E5=8D=95-=E5=AF=B9=E9=BD=90-=E9=97=B4=E9=9A=94=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/usernotification.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 0ebe13f88..f4d08f015 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -364,6 +364,7 @@ h1{ width: calc(100% - 130px); display: inline-block; margin-top: 2px; + height: 40px; } .box-input { From a1423e1519024e3c22a7ec195252760f48340110 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 3 Apr 2023 11:29:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E7=9A=84=E6=9D=83=E9=99=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index df42fb0d9..642624eb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3073,6 +3073,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci: datas) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } } } }