From 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 15 一月 2024 17:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 60cce2a..59f2061 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
@@ -1,5 +1,6 @@
package com.dy.pipIrrBase.role;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.aop.SsoAop;
import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.webUtil.BaseResponse;
@@ -62,12 +63,16 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoRole>>> getRoles(QueryVo vo){
try {
+ //BaRolePermissions baRolePermissions = roleSv.getRolePermissionsById(2023122018334500002L);
+ //return BaseResponseUtils.buildSuccess(baRolePermissions);
+
QueryResultVo<List<VoRole>> res = roleSv.getRoles(vo);
if(res.itemTotal != null && res.itemTotal > 0) {
return BaseResponseUtils.buildSuccess(res);
}else {
return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage());
}
+
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -127,7 +132,7 @@
// 娣诲姞鏉冮檺鍒楄〃
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
Integer rc = Optional.ofNullable(roleSv.addPermissions(baRolePermissions)).orElse(0);
if(rc <= 0) {
return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
@@ -188,7 +193,7 @@
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -196,7 +201,7 @@
// 淇敼瑙掕壊鎺堟潈
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
roleSv.delPermissionsByRoleId(roleId);
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
--
Gitblit v1.8.0