From 32487a093a941e37090e299cc1d7e9e8d124a42f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 16:54:26 +0800
Subject: [PATCH] 1.修改bug  2.添加法律法规实体类

---
 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 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 f1da8e2..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
@@ -65,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");
@@ -82,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());
@@ -154,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");
@@ -223,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){
@@ -240,13 +254,13 @@
     }
 
     @Override
-    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
-        return baseMapper.selectConfigList(page, state,userType,userName);
+    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,String phonenumber) {
-        return baseMapper.selectData(userId,phonenumber);
+    public SysUser selectData(String userId,String phonenumber,String loginName) {
+        return baseMapper.selectData(userId,phonenumber,loginName);
     }
 
 
@@ -284,10 +298,15 @@
     }
 
     @Override
-    public int selectNum(String userType,String userName) {
-        return baseMapper.selectNum(userType,userName);
+    public int selectNum(String userType,String userName,List<String> ids) {
+        return baseMapper.selectNum(userType,userName,ids);
     }
 
 
 
+
+
+
+
+
 }

--
Gitblit v1.7.1