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/service/impl/SysUserServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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 3106c5d..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){
@@ -240,8 +240,8 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
- return baseMapper.selectConfigList(page, state,userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
+ return baseMapper.selectConfigList(page, state,userType,userName);
}
@Override
@@ -284,8 +284,8 @@
}
@Override
- public int selectNum(String userType) {
- return baseMapper.selectNum(userType);
+ public int selectNum(String userType,String userName) {
+ return baseMapper.selectNum(userType,userName);
}
--
Gitblit v1.7.1