From 4c0f9a7eb32a1a449fa472a01d9284642f19cc25 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 17:13:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java |   56 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 8a699d6..7939bda 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -49,13 +49,8 @@
 
     @Override
     public SysUser getUserByAccount(String account) {
-        HashMap<String, Object> map = new HashMap();
-        map.put("login_name", account);
-        List<SysUser> sysUsers = baseMapper.selectByMap(map);
-        if (sysUsers.size() > 0) {
-            return sysUsers.get(0);
-        }
-        return null;
+        SysUser sysUsers = baseMapper.getUserByAccount(account);
+        return sysUsers;
     }
 
     @Override
@@ -70,11 +65,18 @@
         SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
         if (sysUser==null){
             //查询花城e+是否存在此用户
-            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+            HuaChengSysUser huaChengSysUser=null;
+
+            if(list!=null || list.size()>0 )
+            {
+                huaChengSysUser=list.get(0);
+            }
+
             if(huaChengSysUser==null)
             {
                 SysUser newUser = new SysUser();
-                newUser.setUserId(Snowflake.getId());
+                newUser.setUserId(Snowflake.getId()+"");
                 newUser.setLoginName(phonenumber);
                 newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
                 newUser.setUserType("3");
@@ -87,10 +89,10 @@
             else
             {
                 SysUser newUser = new SysUser();
-                newUser.setUserId(huaChengSysUser.getUserId());
+                newUser.setUserId(huaChengSysUser.getUserId()+"");
                 newUser.setLoginName(huaChengSysUser.getPhone());
                 newUser.setUserName(huaChengSysUser.getNickName());
-                newUser.setUserType("3");
+                newUser.setUserType("4");
                 newUser.setPhonenumber(huaChengSysUser.getPhone());
                 newUser.setSex(huaChengSysUser.getSex());
                 newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -159,11 +161,18 @@
         SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
         if (sysUser==null){
             //查询花城e+是否存在此用户
-            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+            List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+            HuaChengSysUser huaChengSysUser=null;
+
+            if(list!=null || list.size()>0 )
+            {
+                huaChengSysUser=list.get(0);
+            }
+
             SysUser newUser = new SysUser();
             if(huaChengSysUser==null)
             {
-                newUser.setUserId(Snowflake.getId());
+                newUser.setUserId(Snowflake.getId()+"");
                 newUser.setLoginName(phonenumber);
                 newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
                 newUser.setUserType("3");
@@ -228,8 +237,8 @@
     }
 
     @Override
-    public List<SysUser> queryList(Integer userType) {
-        return baseMapper.queryList(userType);
+    public List<SysUser> queryList(Integer userType,String keyWord) {
+        return baseMapper.queryList(userType,keyWord);
     }
 
     public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -245,13 +254,13 @@
     }
 
     @Override
-    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
-        return baseMapper.selectConfigList(page, state,userType);
+    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
+        return baseMapper.selectConfigList(page, state,userType,userName,ids);
     }
 
     @Override
-    public SysUser selectData(String userId) {
-        return baseMapper.selectData(userId);
+    public SysUser selectData(String userId,String phonenumber,String loginName) {
+        return baseMapper.selectData(userId,phonenumber,loginName);
     }
 
 
@@ -289,10 +298,15 @@
     }
 
     @Override
-    public int selectNum(String userType) {
-        return baseMapper.selectNum(userType);
+    public int selectNum(String userType,String userName,List<String> ids) {
+        return baseMapper.selectNum(userType,userName,ids);
     }
 
 
 
+
+
+
+
+
 }

--
Gitblit v1.7.1