Commit 2822f314 authored by wujiang's avatar wujiang

修改无权限过滤

parent d65c7bd3
...@@ -42,6 +42,9 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService { ...@@ -42,6 +42,9 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
if (!gatewayIds.isEmpty()) { if (!gatewayIds.isEmpty()) {
map.put("GATEWAY_ID", String.format("[%s]", gatewayIds)); map.put("GATEWAY_ID", String.format("[%s]", gatewayIds));
} }
else {
map.put("GATEWAY_ID", "[NULL]");
}
FeignClientResult<Page<Map<String, Object>>> page = idxFeign.getPage(map); FeignClientResult<Page<Map<String, Object>>> page = idxFeign.getPage(map);
return page.getResult(); return page.getResult();
} }
...@@ -60,6 +63,8 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService { ...@@ -60,6 +63,8 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
String orgcodes = String.join(",", currentUserPermissions); String orgcodes = String.join(",", currentUserPermissions);
if (!orgcodes.isEmpty()) { if (!orgcodes.isEmpty()) {
map.put("ORG_CODE", String.format("[%s]", orgcodes)); map.put("ORG_CODE", String.format("[%s]", orgcodes));
}else {
map.put("ORG_CODE", "[NULL]");
} }
FeignClientResult<Page<Map<String, Object>>> page = idxFeign.getPage(map); FeignClientResult<Page<Map<String, Object>>> page = idxFeign.getPage(map);
return page.getResult(); return page.getResult();
...@@ -81,6 +86,7 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService { ...@@ -81,6 +86,7 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
List<String> permissions = permissionService.getCurrentUserProjectOrgCodes(); List<String> permissions = permissionService.getCurrentUserProjectOrgCodes();
if (Objects.isNull(permissions)) { if (Objects.isNull(permissions)) {
permissions = new ArrayList<>(); permissions = new ArrayList<>();
permissions.add("NULL");
} }
return idxBizTableMapper.getSelectOptions(tableName, column, valueColumn, conditionColumn, conditionValue, isFx, permissions); return idxBizTableMapper.getSelectOptions(tableName, column, valueColumn, conditionColumn, conditionValue, isFx, permissions);
} }
......
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