From fe8bc518d19fcabc536e554dfb186e45ef4d7f43 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
index 3dd277a..89c75fd 100644
--- a/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
@@ -45,12 +45,12 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
if(ids==null || ids.size()<1)
{
return getDataTable("您没有权限查看该数据");
}
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1