Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-16 15:09:33 +08:00
commit 95b17b089b
1 changed files with 1 additions and 1 deletions

View File

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