From dd730295a1df836c872d22a69a816f52e4c5d431 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 15:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/resources/mapper/SysUserMapper.xml | 10 ++++++++--
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 7 ++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 31e38aa..e86c448 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -42,14 +42,15 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",null);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",name);
- int num=IUserService.selectNum("2",null);
+ int num=IUserService.selectNum("2",name);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index 81dbd01..4aaf7fe 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -92,7 +92,10 @@
select count(user_id) from automessage_sys_user
<where>
<if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%')
+ AND user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%')))
+
</if>
<if test="userType != null and userType != ''">
AND user_type=#{userType}
@@ -115,7 +118,10 @@
<include refid="selectSysUserVo"/>
<where>
<if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%')
+ AND user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%')))
+
</if>
<if test="userType != null and userType != ''">
AND user_type=#{userType}
--
Gitblit v1.7.1