From ec96abc7c3d9ef48b00c321eed85f9d934c699a5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 10:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 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 42dde42..4623353 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
@@ -118,6 +118,12 @@
}
else
{
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "账户不存在");
+ }
+
if(!password.equals(user.getPassword()))
{
//提示用户名或密码错误
@@ -229,17 +235,44 @@
return error("手机号不能为空");
}
+
+
+
SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
SysUser user2 = IUserService.selectData("","",config.getLoginName());
if (user != null) {
- //提示用户名或密码错误
- return error("该用户已存在！");
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ config.setUserId(user.getUserId());
+ config.setCreateBy(user.getUserId()+"");
+ config.setUserType("3");
+
+ config.setUpdateTime(LocalDateTime.now());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
}
if(user2 != null)
{
- //提示用户名或密码错误
- return error("该登录账户已存在！请修改登录账户");
+ if(StringUtils.equals("4",user2.getUserType()))
+ {
+ config.setUserId(user2.getUserId());
+ config.setCreateBy(user2.getUserId()+"");
+ config.setUserType("3");
+
+ config.setUpdateTime(LocalDateTime.now());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
}
config.setCreateBy(sysUser.getUserId()+"");
@@ -357,6 +390,20 @@
}
+ /**
+ * 获取登录人员信息
+ *
+ * @return 结果
+ */
+ @ApiOperation("获取登录人员信息")
+ @PostMapping("/getLoginInformation")
+ @Authorization
+ public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
+ {
+ return ResultData.success(sysUse);
+ }
+
+
--
Gitblit v1.7.1