diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java index a3cf165f..34537793 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java @@ -58,7 +58,9 @@ public class SarMenuController extends BaseController { for (SarMenu resultMenu : resultList) { if ("gxhbq".equals(resultMenu.getId())) { // 查出配置管理项 + System.out.println(resultMenu); List getDicList = dicTypeEOService.getDicTypeByDicId("ZHFKGAACTNUCN9AR5YBM"); + System.out.println(getDicList); if (getDicList != null && !getDicList.isEmpty()) { for (SelectionResult selectionResult : getDicList) { int i=0; @@ -75,6 +77,8 @@ public class SarMenuController extends BaseController { } } resultList.addAll(listDic); + System.out.println("listDic"); + System.out.println(listDic); return Result.success(resultList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index df47c5d5..addbb2e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -140,6 +140,7 @@ public class SarStandardsInfoController extends BaseController } } page.setUserId(LoginUserUtil.getUserId()); + System.out.println(page); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } 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 b8c0ea03..3c308f23 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 @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarLawsItems.service.ISarLawsItemsService; import com.adc.da.slrs.sarProductStand.dao.SarProductStandDao; +import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarSarAccess.service.ISarSarAccessService; import com.adc.da.slrs.sarSarAccessInfo.dao.SarSarAccessInfoDao; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; @@ -38,6 +39,7 @@ import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; @@ -151,6 +153,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + List getMenuIdList=tsUserService.getResourceId(new TsResource()); +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + System.out.println("菜单"); + System.out.println(getMenuIdList); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { 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 7e84c625..feb7c4db 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 @@ -63,4 +63,5 @@ public interface ITsUserService extends IService { */ public List getMenusByUserId(String userId); + List getResourceId(TsResource tsResource); } 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 7f732335..8fe1f319 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 @@ -168,4 +168,20 @@ public class TsUserServiceImpl extends ServiceImpl implements List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getMenuByIds(menuIds); } + + /** + * 查询当前登录的用户资源 + * @return List + * @param tsResource + */ + @Override + public List getResourceId(TsResource tsResource) { + UserEO userEO=UserUtils.getUser(); + String userId= userEO.getUsid(); + System.out.println(userId); + List positionIds=tsUserDao.selectPositionIds(userId); + List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); + return tsRoleService.getResourceIdsByRoleIds(roleIds); + + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index e725b2f7..67aec86e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -381,7 +381,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0) where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 @@ -439,7 +439,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -710,7 +710,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id where SAR_STANDARDS_INFO.id = #{id} GROUP BY @@ -828,7 +828,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0) where 1=1