From 0ddd701dcd7d551f351bf30086c0c2fe4a914f19 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 31 十月 2022 14:09:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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 c812741..f1db3a1 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
@@ -46,11 +46,7 @@
@CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
- }
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
@@ -67,11 +63,7 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids= PermissionUtil.getPermission(sysUser);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
- }
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
--
Gitblit v1.7.1