From bc359054c1330f486de6535fecb4b1325081d19a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 09 六月 2022 09:40:46 +0800
Subject: [PATCH] bug修复

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 4374972..8425352 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -173,7 +173,7 @@
         if (admin == null) {
             throw new BusinessException("鎵句笉鍒扮鐞嗗憳");
         }
-        if(!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())){
+        if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
             throw new BusinessException("鍙湁瓒呯骇绠$悊鍛樻墠鑳藉垹闄ょ敤鎴�");
         }
 
@@ -182,6 +182,9 @@
         //鏈夌敤鎴峰繀瀹氭湁鐢ㄦ埛涓庤鑹茬殑鍏崇郴鏁版嵁
         AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, admin.getId()));
         Role role = SpringContextHolder.getBean(RoleService.class).getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, one.getRoleId()));
+        if (role == null) {
+            throw new BusinessException("鏁版嵁寮傚父锛�");
+        }
 
         if (role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
             throw new BusinessException("瓒呯骇绠$悊鍛樻棤娉曞垹闄�");
@@ -197,6 +200,15 @@
             }
         }
 
+        /**
+         * 鍒犻櫎绠$悊鍛� 鏃ュ織璁板綍寮�濮�
+         */
+        String content = "鍒犻櫎绠$悊鍛橈細" + admin.getUsername() + "鐢ㄦ埛id锛�" + admin;
+        StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎绠$悊鍛�", content);
+        /**
+         * 鍒犻櫎绠$悊鍛� 鏃ュ織璁板綍缁撴潫
+         */
+
         return flag;
     }
 

--
Gitblit v1.9.3