From 27704b0f33dfa3b22f11d36124a8d08b720461f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 19 十月 2022 13:27:20 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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..4e4471b 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);
 
     /**
@@ -26,6 +27,10 @@
      * @return 参数配置信息
      */
     public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
+
+
+
+    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
 
 
     /**
@@ -65,5 +70,13 @@
      *
      * @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);
 }

--
Gitblit v1.7.1