From eb6fc0ebcfe457fc30f65e8dfb15b8b05bebda51 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 10:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 474bb45..f094de3 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
@@ -92,16 +92,16 @@
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");
+ SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ if (user != null)
+ {
+ config.setId(user.getId());
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(config));
+ }
+
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId());
--
Gitblit v1.7.1