Compare commits

..

No commits in common. "5a796ec8ffeee2203fad64a41dddf0316267026b" and "e067637d452205e599071556d1dc62a948b0bb4f" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -151,7 +151,7 @@ public class ResourceController {
})
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
// 2022.12.16 后台过滤只出所属区域资源
Boolean region = params.containsKey("region") ? Boolean.parseBoolean(params.get("region").toString()) : false; // 是否需要过滤只出用户所属区域资源
Boolean region = params.containsKey("region") ? (Boolean) params.get("region") : false; // 是否需要过滤只出用户所属区域资源
while (region) {
List<Long> deptIds = new ArrayList<>();
UserDetail user = SecurityUser.getUser(); // 当前用户

View File

@ -529,7 +529,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
Integer pageNum = jsonObject.getInteger("pageNum");
Integer pageSize = jsonObject.getInteger("pageSize");
// 2022.12.16 后台过滤只出所属区域资源
Boolean region = jsonObject.containsKey("region") ? Boolean.parseBoolean(jsonObject.getString("region")) : false; // 是否需要过滤只出用户所属区域资源
Boolean region = jsonObject.containsKey("region") ? jsonObject.getBooleanValue("region") : false; // 是否需要过滤只出用户所属区域资源
while (region) {
UserDetail user = SecurityUser.getUser(); // 当前用户
if (SuperAdminEnum.YES.value() != user.getSuperAdmin()) { // 非超级管理员