From e2058872f49c86b8521354be00347b17c4ece00a Mon Sep 17 00:00:00 2001 From: 11528 <1152856986@qq.com> Date: Tue, 22 Mar 2022 09:56:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgCommittee/service/impl/WgCommitteeServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java index 4d6131a8..9a829cc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgCommittee/service/impl/WgCommitteeServiceImpl.java @@ -13,10 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +import java.util.*; /** *

@@ -44,7 +41,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl list=new ArrayList<>(); if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()) { - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(","))); + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); res.stream().forEach(s -> list.add(new WgCommitteeUser().setCommitterId(s).setId(wgCommittee.getCommitteer()))); iWgCommitteeUserService.saveOrUpdateBatch(list); } @@ -61,7 +58,7 @@ public class WgCommitteeServiceImpl extends ServiceImpl save=new ArrayList<>(); if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){ - List res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds())); + List res=new ArrayList<>(Collections.singletonList(wgCommittee.getCommitteeIds())); res.forEach(s -> save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s)) ); From 9868de7e0a6b8829fd709e33887855c2d33742af Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 11:40:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=E6=B3=A8=E6=8E=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsStandInfoServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index be058360..34fd22d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -151,12 +151,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -180,12 +180,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(userId); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -429,12 +429,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); From 7e41d259443aa232dd91a156360f1248fc7c0c67 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 16:57:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=20pdg?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index be7c405b..7a7db19f 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -138,7 +138,7 @@ stand.edit.file.path = /data/slrs/file/ file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg # ============================================================================= # elasticsearch 配置