From 4cb95859c471a7ebe584af184776e7c0f9a31a8c Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 18:36:28 +0800
Subject: [PATCH] 状态返回
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
index 0916f22..8b96f96 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
@@ -48,7 +48,7 @@
@GetMapping
public AjaxResult profile()
{
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getUserId());
if ("02".equals(user.getUserType())){
SysCompany company = companyService.getById(userService.getById(user.getUserId()).getDeptId());
SysDept sysDept = new SysDept();
@@ -56,8 +56,10 @@
user.setDept(sysDept);
} else {
SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
- sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
- user.setDept(sysDept);
+ if (sysDept!=null){
+ sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+ user.setDept(sysDept);
+ }
}
// 瑙掕壊闆嗗悎
@@ -141,7 +143,7 @@
return error("璇峰～鍐欐墜鏈哄彿");
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
+ SysUser user = userService.selectUserById(SecurityUtils.getUserId());
user.setPhonenumber(phone);
if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
@@ -154,6 +156,9 @@
loginUser.getUser().setUserName(phone);
loginUser.getUser().setPhonenumber(phone);
tokenService.setLoginUser(loginUser);
+ if ("02".equals(user.getUserType())){
+ companyService.update(companyService.lu().set(SysCompany::getCompanyPhone, phone).eq(SysCompany::getCompanyId, user.getDeptId()));
+ }
return success();
}
return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
--
Gitblit v1.9.1