FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_3' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-07-27 10:43:17 +08:00
parent 1de5c838d0 8fd8a7541b
commit 5bb3959002
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application.properties
+1 -1
View File
@@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch
elasticsearch.ip=192.168.10.47 elasticsearch.ip=192.168.10.47
elasticsearch.port=9300 elasticsearch.port=9300
elasticsearch.poolSize=5 elasticsearch.poolSize=5
elas.flag=true elas.flag=false
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+10 -2
View File
@@ -185,8 +185,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
*/ */
public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
//查询当前登录人角色拥有权限的菜单 //查询当前登录人角色拥有权限的菜单
List<String> getMenuIdList=tsUserService.getResourceId(new TsResource()); if(page.getMenuId() != null ){
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) { if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList); page.setMenuRoleList(getMenuIdList);
} else { } else {
@@ -196,6 +201,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (ids != null && !ids.isEmpty()) { if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids); page.setMenuAllChildrenIdList(ids);
} }
}
}
Integer rowCount = dao.getSarStandardsInfoCount(page); Integer rowCount = dao.getSarStandardsInfoCount(page);
page.getPager().setRowCount(rowCount); page.getPager().setRowCount(rowCount);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page); List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);