From 3c0486f18c3936102bc46021cf994647f17e5fe9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:21:16 +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 | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 4de58aa..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,7 +65,14 @@
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();
@@ -85,7 +92,7 @@
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,7 +161,14 @@
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)
{
@@ -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