From 621168af972b38fb8b3753b6ce6cb617d1396468 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 一月 2024 14:02:46 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 59f2061..ed76f2d 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
@@ -104,7 +104,7 @@
// 鑾峰彇瑙掕壊鍚嶇О绾ф潈闄愬垪琛�
String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
- String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+ JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
// 鍒ゆ柇瑙掕壊鍚嶇О鏄惁閲嶅悕
@@ -130,9 +130,9 @@
return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
// 娣诲姞鏉冮檺鍒楄〃
- BaRolePermissions baRolePermissions = new BaRolePermissions();
+ BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(new JSONArray(permissions));
+ baRolePermissions.setPermissions(permissions);
Integer rc = Optional.ofNullable(roleSv.addPermissions(baRolePermissions)).orElse(0);
if(rc <= 0) {
return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
@@ -175,7 +175,8 @@
Long roleId = Optional.ofNullable(po.getRoleid()).orElse(0L);
String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
- String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+ //String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
+ JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);
if(roleId == 0 && roleName.length() == 0)
@@ -193,7 +194,7 @@
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(new JSONArray(permissions));
+ baRolePermissions.setPermissions(permissions);
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -201,7 +202,7 @@
// 淇敼瑙掕壊鎺堟潈
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(new JSONArray(permissions));
+ baRolePermissions.setPermissions(permissions);
roleSv.delPermissionsByRoleId(roleId);
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
--
Gitblit v1.8.0