From a36d83fa50f1af90077eac9aa12d89cf854b49be Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Tue, 27 Feb 2024 16:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E6=A0=91=E7=8A=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shxy/xymanager_admin/controller/RoleController.java     | 2 +-
 .../shxy/xymanager_common/exception/GlobalExceptionHandler.java | 1 -
 .../java/com/shxy/xymanager_service/impl/RoleServiceImpl.java   | 2 ++
 .../java/com/shxy/xymanager_service/service/RoleService.java    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
index 3821cc7..24e7dcf 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
@@ -77,7 +77,7 @@ public class RoleController extends BaseController {
 
     @GetMapping("getPermissionTree")
     @ApiOperation("查询权限树状图")
-    public ResponseReult<PermissionDyLineTreeListModel> getPermissionTree() throws Exception {
+    public ResponseReult<PermissionDyLineTreeListModel> getPermissionTree() {
         ServiceBody<PermissionDyLineTreeListModel> serviceBody = service.getPermissionTree();
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java
index 5467147..7b477ef 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java
@@ -25,7 +25,6 @@ public class GlobalExceptionHandler {
             return ResponseReult.error(e.getErrorCode());
         }
         if (e.getError() != 0) {
-
             return ResponseReult.error(e.getError(), e.getMessage());
         }
         return ResponseReult.error(e.getMessage());
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
index 609da08..4da4691 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java
@@ -143,6 +143,7 @@ public class RoleServiceImpl implements RoleService {
                         bean.setModel(terminalsWithHeart.getModel());
                         bean.setName(terminalsWithHeart.getName());
                         bean.setTowerid(terminalsWithHeart.getTowerid());
+                        beanlist.add(bean);
                     }
                     lineBean.setList(beanlist);
                     lineBeans.add(lineBean);
@@ -150,6 +151,7 @@ public class RoleServiceImpl implements RoleService {
                 dyModel.setList(lineBeans);
                 dyListBeans.add(dyModel);
             }
+            model.setList(dyListBeans);
         }
         return Asserts.success(model);
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java
index bb2ee61..1d9331b 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java
@@ -21,6 +21,6 @@ public interface RoleService {
 
     void changePermission(Integer roleId, List<TbPermission> list) throws Exception;
 
-    ServiceBody<PermissionDyLineTreeListModel> getPermissionTree() throws Exception;
+    ServiceBody<PermissionDyLineTreeListModel> getPermissionTree() ;
 
 }