From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 3b24b17..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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.SysUser;
-import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -15,9 +14,12 @@
*
* @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);
+
/**
* 新增聊天记录
*
@@ -42,13 +44,12 @@
*/
public int deleteConfigById(String id);
-
/**
* 获取数据库总条数（批量）
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead);
/**
* 发送验证码(如果没有该用户则新建用户)
@@ -71,7 +72,6 @@
*/
List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);
-
/**
* 通过手机号获取用户信息
*
@@ -80,4 +80,12 @@
ResultData loginByPhonenumber(String phonenumber);
+ /**
+ * 查询用户列表（不分页）
+ * @param userType 用户类型
+ * @return 结果
+ */
+ List<SysUser> queryList(Integer userType,String keyWor);
+
+
}
--
Gitblit v1.7.1