From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 8a2e10c..d2ff786 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
@@ -69,7 +69,7 @@
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,7 +82,7 @@
else
{
SysUser newUser = new SysUser();
- newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setUserId(huaChengSysUser.getUserId()+"");
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
newUser.setUserType("3");
@@ -158,7 +158,7 @@
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");
@@ -245,8 +245,8 @@
}
@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);
}
--
Gitblit v1.7.1