From 9a87635a1599787948c2f6d1d8086df0730f3b2d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 08 Jun 2021 14:05:55 +0800
Subject: [PATCH] screen-manage                     修改编辑账号功能BUG

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index f01c6b1..d4c2560 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -118,7 +118,7 @@
         List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
 
         //������������
-        List<ManageMenu> menus = null;
+        List<ManageMenu> menus = new ArrayList<>();
         if (!ObjectUtils.isEmpty(roles)) {
             menus = manageMenuService.getParentChildrenMenusByRoles(roles);
         }
@@ -326,6 +326,8 @@
         UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
         deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
         manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
+        //������token
+        TokenUtils.destoryToken(accountId);
         //������������������
         accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
         accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -395,11 +397,13 @@
                 manageAccountRoleMapper.insert(manageAccountRole);
             }
         }
+        //������������������
+        insertUpdateLog(accountUpdateForm, oldManageAccount, oldRoles);
+        //������token
+        TokenUtils.destoryToken(manageAccount.getId());
         //������������������
         accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
         accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
-        //������������������
-        insertUpdateLog(accountUpdateForm, oldManageAccount, oldRoles);
         return accountDTO;
     }
 

--
Gitblit v1.8.0