From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +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 | 15 +++++++++++----
1 files changed, 11 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 458a8b5..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
@@ -28,11 +28,15 @@
*/
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,
+ @Param("isDivisionHead") String isDivisionHead);
- 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 +69,10 @@
*
* @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,
+ @Param("isDivisionHead") String isDivisionHead);
/**
* 根据部门id及分类id获取导办用户
@@ -80,5 +87,5 @@
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(@Param("userType") Integer userType,String keyWord);
+ List<SysUser> queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
}
--
Gitblit v1.7.1