From 0cb8527e35db76eb5ab663524e374f3c8f4b402c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:32:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
index 5d55e7c..d6541bd 100644
--- a/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
@@ -43,12 +43,12 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids= PermissionUtil.getPermission(sysUser);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
if(ids==null || ids.size()<1)
{
return getDataTable("您没有权限查看该数据");
}
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1