From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 2 +-
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 2 +-
flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java | 4 ++--
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 5 ++---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 4 ++--
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
index e2352af..958b338 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
@@ -49,8 +49,8 @@
*/
@ApiOperation(value = " 查询导办用户列表（不分页）",response = SysUser.class)
@GetMapping("/queryList")
- public ResultData queryList(){
- return ResultData.success(IUserService.queryList(2));
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
}
}
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 c1d7e8e..8d421dd 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
@@ -219,8 +219,7 @@
@ApiOperation(" 查询导办用户列表（不分页）")
@GetMapping("/queryList")
@Authorization
- public ResultData queryList(){
- return ResultData.success(IUserService.queryList(2));
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
}
-
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
index c4fe217..458a8b5 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -80,5 +80,5 @@
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(@Param("userType") Integer userType);
+ List<SysUser> queryList(@Param("userType") Integer userType,String keyWord);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index e0f3f76..f97f496 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -84,7 +84,7 @@
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(Integer userType);
+ List<SysUser> queryList(Integer userType,String keyWor);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index f1da8e2..8a2e10c 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -223,8 +223,8 @@
}
@Override
- public List<SysUser> queryList(Integer userType) {
- return baseMapper.queryList(userType);
+ public List<SysUser> queryList(Integer userType,String keyWord) {
+ return baseMapper.queryList(userType,keyWord);
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
--
Gitblit v1.7.1