From c4dfc206abce25a40dde51a4aae021424be4b524 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 17 十月 2022 13:31:01 +0800
Subject: [PATCH] 修改小程序登录重复注册 bug

---
 flower_city/src/main/java/com/dg/core/controller/UserController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 7203e5d..7815ece 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -26,7 +26,7 @@
 @Api(tags = {"用户接口"})
 @RestController
 @RequestMapping("/user")
-public class UserController extends BaseController{
+public class UserController extends BaseController {
     @Autowired
     com.dg.core.service.ISysUserService IUserService;
 
@@ -62,12 +62,12 @@
             }
 
             //本地表查询用户
-            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
             if (user == null) {
                 //本地没有此用户  新用户
                 SysUser newSysUser=new SysUser();
                 //默认  1系统后台用户
-                newSysUser.setUserType("1");
+                newSysUser.setUserType("3");
                 newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                 newSysUser.setUserId(huaChengSysUser.getUserId());
                 newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -79,7 +79,7 @@
                 IUserService.insertConfig(newSysUser);
             }
 
-            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
 
             if (user == null) {
                 return ResultData.error("用户不存在!请联系管理员");
@@ -212,7 +212,7 @@
             return error("该账户已存在!");
         }
 
-        config.setUserType("1");
+        config.setUserType("3");
 
         config.setCreateTime(LocalDateTime.now());
         config.setUpdateTime(LocalDateTime.now());
@@ -241,7 +241,7 @@
             return error("账户不能为空");
         }
 
-        config.setUserType("1");
+        config.setUserType("3");
 
         return toAjax(IUserService.updateConfig(config));
     }
@@ -280,7 +280,7 @@
             return error("userId不能为空");
         }
 
-        SysUser sysUser=IUserService.selectData(userId);
+        SysUser sysUser=IUserService.selectData(userId,null);
         //删除标志(0代表存在 2代表删除)
         sysUser.setDelFlag("2");
         return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +308,7 @@
             return error("密码不能为空");
         }
 
-        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
+        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
         if(sysUser==null)
         {
             return error("用户不存在");

--
Gitblit v1.7.1