From 2c2994b7a998a9b324d96e4a6e19a42b35db88f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 15:18:44 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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..a5144dc 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
@@ -28,11 +28,14 @@
*/
public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
@Param("userType") String userType,
- @Param("userName") String userName);
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids);
- SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
+ SysUser selectData(@Param("userId") String userId,
+ @Param("phonenumber") String phonenumber,
+ @Param("loginName") String loginName);
/**
@@ -65,7 +68,9 @@
*
* @return 结果
*/
- public int selectNum(@Param("userType") String userType,@Param("userName") String userName);
+ public int selectNum(@Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids);
/**
* 根据部门id及分类id获取导办用户
@@ -80,5 +85,5 @@
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(@Param("userType") Integer userType);
+ List<SysUser> queryList(@Param("userType") Integer userType,String keyWord);
}
--
Gitblit v1.7.1