From 49a6dcbb3525eb0051549b7141914551323d2af1 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Tue, 22 Mar 2022 18:07:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F,=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xhm-system/src/main/resources/mapper/system/SysUserMapper.xml   | 2 +-
 .../com/xhm/wjnft/service/impl/WjArtApplicationServiceImpl.java | 2 +-
 .../java/com/xhm/wjnft/service/impl/WjArtistServiceImpl.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xhm-system/src/main/resources/mapper/system/SysUserMapper.xml b/xhm-system/src/main/resources/mapper/system/SysUserMapper.xml
index 67f29af..5941932 100644
--- a/xhm-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/xhm-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
+		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag != 2 limit 1
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
diff --git a/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtApplicationServiceImpl.java b/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtApplicationServiceImpl.java
index 269385f..5cce60a 100644
--- a/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtApplicationServiceImpl.java
+++ b/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtApplicationServiceImpl.java
@@ -144,7 +144,7 @@ public class WjArtApplicationServiceImpl implements IWjArtApplicationService {
             if (user == null || user.getDelFlag().equals("2")) {
                 SysUser sysUser = new SysUser();
                 sysUser.setUserName(users.getPhone());
-                sysUser.setNickName(users.getNickname());
+                sysUser.setNickName(wjArtApplicationmsg.getNickname());
                 BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
                 String Password = bCryptPasswordEncoder.encode("123456");
                 sysUser.setPassword(Password);
diff --git a/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtistServiceImpl.java b/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtistServiceImpl.java
index 2f9aca8..78bada6 100644
--- a/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtistServiceImpl.java
+++ b/xhm-wjnft/src/main/java/com/xhm/wjnft/service/impl/WjArtistServiceImpl.java
@@ -153,7 +153,7 @@ public class WjArtistServiceImpl implements IWjArtistService {
         if (user == null || user.getDelFlag().equals("2")) {
             SysUser sysUser = new SysUser();
             sysUser.setUserName(users.getPhone());
-            sysUser.setNickName(users.getNickname());
+            sysUser.setNickName(Artistmsg.getArtistName());
             BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
             String Password = bCryptPasswordEncoder.encode("123456");
             sysUser.setPassword(Password);