From 20681d803038c3a25a49879c20f08e391b566f0d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 15:24:30 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 8 +++++---
1 files changed, 5 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 a5144dc..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
@@ -29,7 +29,8 @@
public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
@Param("userType") String userType,
@Param("userName") String userName,
- @Param("ids") List<String> ids);
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
@@ -70,7 +71,8 @@
*/
public int selectNum(@Param("userType") String userType,
@Param("userName") String userName,
- @Param("ids") List<String> ids);
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
/**
* 根据部门id及分类id获取导办用户
@@ -85,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