From 387a97a46cc9e9e48b90fa132558e5fa23c75274 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 27 Jul 2021 09:50:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A0=91=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0af77f7f..df3ee156 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -185,16 +185,24 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - List getMenuIdList=tsUserService.getResourceId(new TsResource()); -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - 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); + if(page.getMenuId() != null ){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceId(new TsResource()); + 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); + } + } + } Integer rowCount = dao.getSarStandardsInfoCount(page); page.getPager().setRowCount(rowCount); From b5a53bf905ba90e41129dc34153de896c768580b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 27 Jul 2021 10:40:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20es=20MQ=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= 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 fb339ca5..3512876a 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 -elas.flag=true +elas.flag=false