diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index f0993f03..ccd01652 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -267,6 +267,21 @@ public class SarBussionessStandController extends BaseController List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception; + boolean checkIsShow(SarBussionessStandEOPage page) throws Exception; + List getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index e79a8611..f1f6644e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1062,6 +1062,71 @@ public class SarBussionessStandServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){ + 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); + } + }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + }else if(page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())){ + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuTopId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + //配置列表显示的数据权限 + List sarlist = new ArrayList<>(); + List access = tsUserService.getResourceDataUserId(page.getUserId()); + if (null == page.getMenuId() && null == page.getMenuAllChildrenIdList()) { + page.setMenuAllChildrenIdList(access); + page.setMenuId(""); + } else if (page.getMenuId().equals("3")) { + page.setMenuAllChildrenIdList(access); + } + List finalData = page.getMenuAllChildrenIdList().stream().filter(s -> access.contains(s)).collect(Collectors.toList()); + if (finalData.size() > 0) { + page.setMenuAllChildrenIdList(finalData); + if (null == page.getMenuId() && null == page.getMenuAllChildrenIdList()) { + page.setMenuAllChildrenIdList(access); + } + Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page); + if (rowCount>0) { + return true; + }else { + return false; + } + } else { + return false; + } + } + + @Override public List getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 5b18678d..857d5e46 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -569,6 +569,9 @@ #{item} + + and SAR_BUSSIONESS_STAND.id = #{id} + and SAR_BUSSIONESS_STAND.stand_sort = #{standSort}