From 041df2aebc9eb1a46cf19bb3918e6c022e929bb8 Mon Sep 17 00:00:00 2001
From: lihongbiao <964708803@qq.com>
Date: Sat, 19 Jul 2025 21:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/security/service/UserDetailsServiceImpl.java      | 2 +-
 .../aircraft/modules/system/service/impl/UserServiceImpl.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java
index e82935a..e52bb13 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/security/service/UserDetailsServiceImpl.java
@@ -67,7 +67,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
 //                    emEmployees = emEmployeesService.findByUserId(user.getId());
 //                }
                 // 初始化JwtUserDto
-                jwtUserDto = new JwtUserDto(BeanUtil.copyProperties(user, LoginUserDto.class), UserTypeEnum.getByValue(user.getUserType()),dataService.getDeptIds(user), authorities,emEmployees);
+                jwtUserDto = new JwtUserDto(BeanUtil.copyProperties(user, LoginUserDto.class), UserTypeEnum.getByValue(user.getUserType()),null, authorities,emEmployees);
                 // 添加缓存数据
                 userCacheManager.addUserCache(username, jwtUserDto);
             }
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java
index 8de8ad8..1efbc66 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java
@@ -136,7 +136,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
-        user.setPassword(passwordEncoder.encode(RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword())));
+        if (resources.getPassword()!=null){
+            user.setPassword(passwordEncoder.encode(RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,resources.getPassword())));
+        }
         user.setUsername(resources.getUsername());
         user.setScenicId(resources.getScenicId());
         user.setEnabled(resources.getEnabled());