From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ISysUserService.java |   27 +++++++++++++++++++++------
 1 files changed, 21 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 31d4795..f97f496 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,20 +3,21 @@
 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;
 
-public interface ISysUserService {
-    SysUser getUserById(Long id);
+public interface ISysUserService
+{
     SysUser getUserByAccount(String account);
     /**
      * 查询聊天列表
      *
      * @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);
 
+
+    SysUser selectData(String userId,String phonenumber);
 
     /**
      * 新增聊天记录
@@ -42,13 +43,12 @@
      */
     public int deleteConfigById(String id);
 
-
     /**
      * 获取数据库总条数(批量)
      *
      * @return 结果
      */
-    public int selectNum(String userType);
+    public int selectNum(String userType,String userName);
 
     /**
      * 发送验证码(如果没有该用户则新建用户)
@@ -71,5 +71,20 @@
      */
     List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);
 
+    /**
+     * 通过手机号获取用户信息
+     *
+     * @return 结果
+     */
+    ResultData loginByPhonenumber(String phonenumber);
+
+
+    /**
+     * 查询用户列表(不分页)
+     * @param userType 用户类型
+     * @return 结果
+     */
+    List<SysUser> queryList(Integer userType,String keyWor);
+
 
 }

--
Gitblit v1.7.1