diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 39e2f196..5fef685e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -97,4 +97,7 @@ public class TsResource extends BaseEntity { @TableField(exist=false) private List childMenuIds; + @TableField(exist=false) + private String userId; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 17df5063..45327104 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -167,20 +167,22 @@ public class TsResourceServiceImpl extends ServiceImpl getList(TsResource tsResource) { List TsResources = new ArrayList<>(); - List getMenuIdList = tsUserService.getResourceId(new TsResource()); + if(tsResource.getUserId() != null){ + List getMenuIdList = tsUserService.getResourceUserId(tsResource.getUserId()); - if(!getMenuIdList.isEmpty()){ - QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); - if(tsResource.getSorDivide()!=null){ - tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); - } - tsResourceQueryWrapper.isNull("PARENT_ID"); - tsResourceQueryWrapper.in("ID",getMenuIdList); - tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); - TsResources=dao.selectList(tsResourceQueryWrapper); + if(!getMenuIdList.isEmpty()){ + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + tsResourceQueryWrapper.isNull("PARENT_ID"); + tsResourceQueryWrapper.in("ID",getMenuIdList); + tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); + TsResources=dao.selectList(tsResourceQueryWrapper); - for(TsResource TsResource:TsResources){ - TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + for(TsResource TsResource:TsResources){ + TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java index 9283ddc5..9fa14080 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java @@ -13,5 +13,6 @@ public class StandardsInfoExcelVO { String standSort; String standNumber; String collectMenuId; + String userId; } 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 cb0b7ed8..1b2bddea 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 @@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - if(page.getMenuId() != null ){ + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ 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()); + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { @@ -1349,7 +1349,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getMenuIdList=tsUserService.getResourceId(new TsResource()); + List getMenuIdList = new ArrayList<>(); + if(standardsInfoExcelVO.getUserId() != null){ + getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId()); + } // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 8100abb5..2be89ea5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -65,6 +65,8 @@ public interface ITsUserService extends IService { List getResourceId(TsResource tsResource); + List getResourceUserId(String userId); + /** * 导入人员数据 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index c3c4e8cb..12d7b452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -195,6 +195,18 @@ public class TsUserServiceImpl extends ServiceImpl implements } + /** + * 查询当前登录的用户资源 + * @return List + */ + @Override + public List getResourceUserId(String userId) { + List positionIds=tsUserDao.selectPositionIds(userId); + List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); + return tsRoleService.getResourceIdsByRoleIds(roleIds); + + } + /** * 导入人员数据 */