From 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 14 十一月 2022 17:43:00 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index c8556f4..762f3d4 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -157,6 +157,12 @@
 
         config.setUserType("2");
 
+        SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+        if (user != null && !(user.getUserId().equals(config.getUserId())))
+        {
+            //提示用户名或密码错误
+            return ResultData.error("该手机账户已存在!请更换手机号");
+        }
         return toAjax(IUserService.updateConfig(config));
     }
 

--
Gitblit v1.7.1