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/service/ISysUserService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index c6e3036..aa6ac87 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -14,10 +14,11 @@
*
* @return 参数配置信息
*/
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
+ String userName,List<String> ids,String isDivisionHead);
- SysUser selectData(String userId);
+ SysUser selectData(String userId,String phonenumber,String loginName);
/**
* 新增聊天记录
@@ -48,7 +49,7 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead);
/**
* 发送验证码(如果没有该用户则新建用户)
@@ -78,12 +79,13 @@
*/
ResultData loginByPhonenumber(String phonenumber);
+
/**
* 查询用户列表（不分页）
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(Integer userType);
+ List<SysUser> queryList(Integer userType,String keyWor);
}
--
Gitblit v1.7.1