From 2d528d024b179b6b06d1d2702e72f6caa5f67149 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 1fc17af..45f1d99 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -44,8 +44,8 @@
@RequiresPermissions("system:permission:query")
public ApiResponse<List<SystemPermission>> findAll () {
SystemPermission systemPermission = new SystemPermission();
- systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.TWO}));
+// systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.TWO}));
systemPermission.setDeleted(Boolean.FALSE);
- return ApiResponse.success(systemPermissionService.findList(systemPermission));
+ return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType()));
}
}
--
Gitblit v1.9.3