From 79b75c02532e9826088a216130f6a1be8c15278d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 05 十一月 2024 21:30:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index a8fca76..49b593c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -44,10 +44,13 @@
      */
     public String register(RegisterBody registerBody)
     {
-        String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
+        String msg = "", username = registerBody.getNickname(), password = registerBody.getPassword();
         SysUser sysUser = new SysUser();
-        sysUser.setUserName(username);
+//        System.out.println(username);
+//        System.out.println("+++++++++++++++++++++==");
 
+        sysUser.setNickName(username);
+        sysUser.setUserName(username);
         // 楠岃瘉鐮佸紑鍏�
         boolean captchaEnabled = configService.selectCaptchaEnabled();
         if (captchaEnabled)
@@ -73,7 +76,7 @@
         {
             msg = "瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�";
         }
-        else if (!userService.checkUserNameUnique(sysUser))
+        else if (!userService.checkNickNameUnique(sysUser))
         {
             msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪";
         }

--
Gitblit v1.9.1