|
@@ -69,8 +69,10 @@ public class UserServiceImpl implements UserService {
|
|
|
List<HashMap<String, Object>> dataRangeList = sysUserCQuery.selectUserDataRange(userID);
|
|
|
List<String> userCompanyList = sysUserCQuery.selectUserCompany(userID);
|
|
|
List<String> userSiteList = sysUserCQuery.selectUserSite(userID);
|
|
|
+ List<String> userSiteOracleIDList = sysUserCQuery.selectUserSiteOracleID(userID);
|
|
|
List<String> userInstitutionList = sysUserCQuery.selectUserInstitution(userID);
|
|
|
List<String> userRegionList = sysUserCQuery.selectUserRegion(userID);
|
|
|
+ List<String> userRegionSiteOracleIDList = sysUserCQuery.selectUserRegionSiteOracleID(userID);
|
|
|
List<String> userCityList = sysUserCQuery.selectUserCity(userID);
|
|
|
List<DataRange> result = new ArrayList<>();
|
|
|
Map<String, List<HashMap<String, Object>>> menuGrouping = dataRangeList.stream()
|
|
@@ -98,13 +100,23 @@ public class UserServiceImpl implements UserService {
|
|
|
menuDataRange.setRangeIDList(userCityList);
|
|
|
break;
|
|
|
case Region:
|
|
|
- menuDataRange.setRangeIDList(userRegionList);
|
|
|
+ if (key.equals("T01020301")) {
|
|
|
+ userRegionList.addAll(userRegionSiteOracleIDList);
|
|
|
+ menuDataRange.setRangeIDList(userRegionList);
|
|
|
+ } else {
|
|
|
+ menuDataRange.setRangeIDList(userRegionList);
|
|
|
+ }
|
|
|
break;
|
|
|
case Institution:
|
|
|
menuDataRange.setRangeIDList(userInstitutionList);
|
|
|
break;
|
|
|
case Site:
|
|
|
- menuDataRange.setRangeIDList(userSiteList);
|
|
|
+ if (key.equals("T01020301")) {
|
|
|
+ userSiteList.addAll(userSiteOracleIDList);
|
|
|
+ menuDataRange.setRangeIDList(userSiteList);
|
|
|
+ } else {
|
|
|
+ menuDataRange.setRangeIDList(userSiteList);
|
|
|
+ }
|
|
|
break;
|
|
|
case Company:
|
|
|
menuDataRange.setRangeIDList(userCompanyList);
|