Commit 5175a6c3 authored by wujiang's avatar wujiang

修复全国权限不显示

parent 81b1130a
...@@ -77,7 +77,7 @@ public class IPermissionServiceImpl implements IPermissionService { ...@@ -77,7 +77,7 @@ public class IPermissionServiceImpl implements IPermissionService {
String companyLevel = companyInfo.get("level"); String companyLevel = companyInfo.get("level");
if (companyLevel.equals("categroy_leve2")) { if (companyLevel.equals("categroy_leve2")) {
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));
result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList()); result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
return result; return result;
} }
if (companyLevel.equals("area")) { if (companyLevel.equals("area")) {
......
...@@ -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().equals(str)){ if (str.startsWith(x.getCode())){
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