Commit 03192419 authored by wujiang's avatar wujiang

修复全国权限不显示问题

parent bef1cc12
...@@ -45,7 +45,9 @@ public class IPermissionServiceImpl implements IPermissionService { ...@@ -45,7 +45,9 @@ public class IPermissionServiceImpl implements IPermissionService {
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode); Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level"); String companyLevel = companyInfo.get("level");
if (companyLevel.equals("categroy_leve2")) { if (companyLevel.equals("categroy_leve2")) {
return stdUserEmpower.getAmosOrgCode(); List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
return result;
} }
if (companyLevel.equals("area")) { if (companyLevel.equals("area")) {
List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode)); List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
...@@ -74,7 +76,9 @@ public class IPermissionServiceImpl implements IPermissionService { ...@@ -74,7 +76,9 @@ public class IPermissionServiceImpl implements IPermissionService {
Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode); Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
String companyLevel = companyInfo.get("level"); String companyLevel = companyInfo.get("level");
if (companyLevel.equals("categroy_leve2")) { if (companyLevel.equals("categroy_leve2")) {
return stdUserEmpower.getAmosOrgCode(); List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
return result;
} }
if (companyLevel.equals("area")) { if (companyLevel.equals("area")) {
List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode)); List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
......
...@@ -183,7 +183,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -183,7 +183,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
targetList = tempList.stream().filter(x -> { targetList = tempList.stream().filter(x -> {
if (CollectionUtil.isNotEmpty(codes)) { if (CollectionUtil.isNotEmpty(codes)) {
for (String str : codes) { for (String str : codes) {
if (x.getCode().startsWith(str)){ if (x.getCode().equals(str)){
return true; return true;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment