From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
index b4133a3..80b6aec 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -86,6 +87,7 @@
@RequiresPermissions("system:permission:query")
public ApiResponse<List<SystemPermission>> findAll () {
SystemPermission systemPermission = new SystemPermission();
+ systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.ONE}));
systemPermission.setDeleted(Boolean.FALSE);
return ApiResponse.success(systemPermissionService.findList(systemPermission));
}
@@ -95,7 +97,7 @@
@RequiresPermissions("system:permission:query")
public ApiResponse<List<SystemPermission>> findAllCom () {
SystemPermission systemPermission = new SystemPermission();
- systemPermission.setType(Constants.ONE);
+ systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.TWO}));
systemPermission.setDeleted(Boolean.FALSE);
return ApiResponse.success(systemPermissionService.findList(systemPermission));
}
--
Gitblit v1.9.3