From 8669da14a12a3e9a8a7ae720cf65798cb2751e73 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 26 十月 2022 15:00:59 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

---
 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index d8b2ecc..618272d 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -8,6 +8,7 @@
 import com.dg.core.db.gen.entity.SysUser;
 import com.dg.core.service.IOrganizationChartService;
 import com.dg.core.service.IReplyTemplateService;
+import com.dg.core.util.PermissionUtil;
 import com.dg.core.util.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,7 +44,7 @@
                                           @CurrentUser SysUser sysUser)
     {
         Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
-        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
         List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
         int num=iReplyTemplateService.countNum(Name,ids);
         return getDataTable(list,num);

--
Gitblit v1.7.1