From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 e246c18..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,7 +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(@Param("userId") String userId,
+ @Param("phonenumber") String phonenumber,
+ @Param("loginName") String loginName);
/**
@@ -58,12 +69,23 @@
*
* @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获取导办用户
*
* @return 结果
*/
- List<SysUser> selectListByDepartmentId(@Param("departmentId") String departmentId,@Param("classifyId") String classifyId);
+ 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,@Param("keyWord") String keyWord);
}
--
Gitblit v1.7.1