From afaadcfef9aa4213533d2055e77ce2a69fe087f1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 14:01:02 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java |   11 ++++++++---
 1 files changed, 8 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 c4b69ad..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,7 +28,9 @@
      */
     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);
 
 
 
@@ -67,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获取导办用户
@@ -82,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