From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 5bb1a43..4e1a289 100644
--- a/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -43,8 +43,8 @@
@RequiresPermissions("system:permission:query")
public ApiResponse<List<SystemPermission>> findAll () {
SystemPermission systemPermission = new SystemPermission();
- systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.THREE}));
+// systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.THREE}));
systemPermission.setDeleted(Boolean.FALSE);
- return ApiResponse.success(systemPermissionService.findList(systemPermission));
+ return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType()));
}
}
--
Gitblit v1.9.3