From ec96abc7c3d9ef48b00c321eed85f9d934c699a5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 10:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 7 ++++++-
1 files changed, 6 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 489c5d6..fb1fc73 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
@@ -45,7 +45,12 @@
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ List<ReplyTemplateEntity> list;
+ if (sysUser.getUserType().equals("2")){
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
+ }
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1