From 47b8d29b211c1a3644955ef768d01d2985a25dfc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 16:43:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 6 +++---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 2 +-
flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index 7cb1f51..eeb3607 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -41,13 +41,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<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name,ids);
- int num=iElseAccessoryService.countNum(Name,ids);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
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 6f4c86e..d8b2ecc 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
@@ -39,7 +39,7 @@
@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);
diff --git a/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
index f8e3656..86d5052 100644
--- a/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
+++ b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
@@ -50,7 +50,7 @@
<include refid="selectReplyTemplateVo"/>
<where>
<if test="Name != null and Name != ''">
- AND name=#{Name}
+ AND automessage_reply_template.name like concat('%', #{Name}, '%')
</if>
<if test="ids != null">
and department_id IN
--
Gitblit v1.7.1