From 101192fd84bb38911ea7bc84c21cfe2b9ba378c7 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 14:25:30 +0800
Subject: [PATCH] 审批修改
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..b8559d2 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);
+ }
}
// 瑙掕壊闆嗗悎
--
Gitblit v1.9.1