From 80d46efc8d59cd4ad8c974fe083e5e41128a657b Mon Sep 17 00:00:00 2001
From: tangzh <tangzh@3721zh.com>
Date: Sat, 19 Jul 2025 17:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/BusUserDeviceServiceImpl.java        | 5 ++++-
 .../modules/system/service/impl/UserServiceImpl.java         | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserDeviceServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserDeviceServiceImpl.java
index 0bf3331..c494f30 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserDeviceServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserDeviceServiceImpl.java
@@ -47,7 +47,10 @@ public class BusUserDeviceServiceImpl extends ServiceImpl<BusUserDeviceMapper, B
     @Transactional(rollbackFor = Exception.class)
     public void updUserCommands(BusUser busUser) {
         List<BusTreeVo> commands = busUser.getCommands();
-        if (null == commands || commands.isEmpty()) { return; }
+        if (null == commands || commands.isEmpty()) {
+            busUserDeviceMapper.delete(new QueryWrapper<BusUserDevice>().eq("user_id", busUser.getId()));
+            return;
+        }
         List<BusTreeVo> userDevices = commands.stream().filter(i -> i.getId().contains("d")).collect(Collectors.toList());
         List<BusTreeVo> userCommands = commands.stream().filter(i -> i.getId().contains("c")).collect(Collectors.toList());
         List<BusUserDevice> oldUserDevices = busUserDeviceMapper.selectList(new QueryWrapper<BusUserDevice>().eq("user_id", busUser.getId()));
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
index ba14486..5d2b023 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
@@ -136,6 +136,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
+        // 清除缓存
+        delCaches(user.getId(), user.getUsername());
         user.setDeptId(resources.getDept().getId());
         user.setUsername(resources.getUsername());
         user.setEmail(resources.getEmail());
@@ -147,8 +149,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         user.setNickName(resources.getNickName());
         user.setGender(resources.getGender());
         saveOrUpdate(user);
-        // 清除缓存
-        delCaches(user.getId(), user.getUsername());
         // 更新用户岗位
         userJobMapper.deleteByUserId(resources.getId());
         userJobMapper.insertData(resources.getId(), resources.getJobs());