From dab9e6bb95925acaf3ca21eb1b3e66a6ebc73b32 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 11 十一月 2022 14:05:06 +0800
Subject: [PATCH] 修改导办人员修改手机号报错 bug
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 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..764bbb4 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,22 +235,50 @@
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.setIsDivisionHead("1");
+ 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.setIsDivisionHead("1");
+ config.setUpdateTime(LocalDateTime.now());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
}
config.setCreateBy(sysUser.getUserId()+"");
config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
+ config.setIsDivisionHead("1");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -357,6 +391,20 @@
}
+ /**
+ * 获取登录人员信息
+ *
+ * @return 结果
+ */
+ @ApiOperation("获取登录人员信息")
+ @PostMapping("/getLoginInformation")
+ @Authorization
+ public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
+ {
+ return ResultData.success(sysUse);
+ }
+
+
--
Gitblit v1.7.1