排序,重复

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">

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);

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);