From dc2145e16abaa09f89ab5319fc84c8a53e3cea69 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 17:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 db3cc08..474bb45 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
@@ -87,12 +87,19 @@
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
+ ResultData data = IUserService.loginByPhonenumber(config.getPhonenumber());
+ if (data != null)
+ {
+ SysUser user= (SysUser) data.getData();
+ user.setUserType("2");
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
config.setUserType("2");
config.setCreateTime(LocalDateTime.now());
--
Gitblit v1.7.1