From c9cd30d5beab336ff61da1d6f6cdbe28c4dcd4e8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 17:18:49 +0800
Subject: [PATCH] 修改回复模板报错 bug
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 bfd7e48..60291a6 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
@@ -6,6 +6,7 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.ReplyTemplateEntity;
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.TableDataInfo;
import io.swagger.annotations.Api;
@@ -25,6 +26,10 @@
@Autowired
IReplyTemplateService iReplyTemplateService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
/**
* 获取模板列表
* @return
@@ -34,11 +39,13 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name)
+ @RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name);
- int num=iReplyTemplateService.countNum(Name);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -78,7 +85,6 @@
{
return ResultData.error("模板名称不能为空");
}
-
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
--
Gitblit v1.7.1