From dade3b76987f4c8126a31a4d477d14567201e1b3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:40:00 +0800
Subject: [PATCH] 修改BUG
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index 7cb1f51..6b62820 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -8,6 +8,7 @@
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IElseAccessoryService;
import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,13 +42,17 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name,
+ @RequestParam(value = "name",required = false) String name,
@CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name,ids);
- int num=iElseAccessoryService.countNum(Name,ids);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
@@ -62,7 +67,11 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
--
Gitblit v1.7.1