From d79d2f12c82cac10ba28117a9ee49bc5fdc2842d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 13 十一月 2024 16:05:28 +0800
Subject: [PATCH] 1、完善通信中间件远程升级任务模块; 2、web端实现升级任务发布执行功能; 3、web端实现升级任务执行监视功能; 4、web端添加模拟升级过程逻辑。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
index 4bca493..c5c3917 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
@@ -64,7 +64,7 @@
             if(res.itemTotal != null && res.itemTotal > 0) {
                 return BaseResponseUtils.buildSuccess(res);
             }else {
-                return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage());
+                return BaseResponseUtils.buildSuccess(SystemResultCode.NO_ROLES.getMessage());
             }
 
         } catch (Exception e) {
@@ -104,7 +104,7 @@
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
-        Long roleId = Optional.ofNullable(po.getRoleid()).orElse(0L);
+        Long roleId = Optional.ofNullable(po.getRoleId()).orElse(0L);
         String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
         JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
         Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);

--
Gitblit v1.8.0