From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 18 ++++++++++++++----
1 files changed, 14 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 112b146..892fbb3 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
@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {
SysUser getUserById(Long id);
+
SysUser getUserByAccount(String account);
/**
@@ -25,11 +26,17 @@
*
* @return 参数配置信息
*/
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
+ @Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
- SysUser selectData(String userId);
+ SysUser selectData(@Param("userId") String userId,
+ @Param("phonenumber") String phonenumber,
+ @Param("loginName") String loginName);
/**
@@ -62,7 +69,10 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(@Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
/**
* 根据部门id及分类id获取导办用户
@@ -77,5 +87,5 @@
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(@Param("userType") Integer userType);
+ List<SysUser> queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
}
--
Gitblit v1.7.1