Compare commits
No commits in common. "5db160ca187e7ab8019aa001fc3a86e5efc46076" and "2e5677486a409aa8aee2477d43306a511ab744c6" have entirely different histories.
5db160ca18
...
2e5677486a
|
@ -151,7 +151,7 @@ public class ResourceController {
|
||||||
})
|
})
|
||||||
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
||||||
// 2022.12.16 后台过滤只出所属区域资源
|
// 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) {
|
while (region) {
|
||||||
List<Long> deptIds = new ArrayList<>();
|
List<Long> deptIds = new ArrayList<>();
|
||||||
UserDetail user = SecurityUser.getUser(); // 当前用户
|
UserDetail user = SecurityUser.getUser(); // 当前用户
|
||||||
|
|
|
@ -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") ? Boolean.parseBoolean(jsonObject.getString("region")) : false; // 是否需要过滤只出用户所属区域资源
|
Boolean region = jsonObject.containsKey("region") ? jsonObject.getBooleanValue("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()) { // 非超级管理员
|
||||||
|
|
Loading…
Reference in New Issue