From 9db2129f14042a729ad382db48b4eb58aadb7292 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 15:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 05f9292..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
@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {
SysUser getUserById(Long id);
+
SysUser getUserByAccount(String account);
/**
@@ -25,11 +26,13 @@
*
* @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);
- SysUser selectData(String userId);
+ SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
/**
@@ -62,7 +65,7 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(@Param("userType") String userType,@Param("userName") String userName);
/**
* 根据部门id及分类id获取导办用户
@@ -70,4 +73,12 @@
* @return 结果
*/
List<SysUser> selectListByDepartmentId(@Param("list") List<String> list,@Param("classifyIdFront") String classifyIdFront,@Param("classifyIdAfter") String classifyIdAfter);
+
+
+ /**
+ * 查询用户列表（不分页）
+ * @param userType 用户类型
+ * @return 结果
+ */
+ List<SysUser> queryList(@Param("userType") Integer userType,String keyWord);
}
--
Gitblit v1.7.1