From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时,不会出现时长设置过长的问题

---
 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