From 6a76e1e6b05cb8cb8dd19299f23d1b825adf4abd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 17:34:09 +0800
Subject: [PATCH] 提交一把

---
 server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 80b6aec..81fb850 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
@@ -87,9 +87,10 @@
     @RequiresPermissions("system:permission:query")
     public ApiResponse<List<SystemPermission>> findAll () {
         SystemPermission systemPermission = new SystemPermission();
-        systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.ONE}));
+//        systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.ONE}));
+//        systemPermission.setIsadmin(Constants.ONE);
         systemPermission.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemPermissionService.findList(systemPermission));
+        return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType()));
     }
 
     @ApiOperation("鏌ヨ鎵�鏈�")
@@ -97,8 +98,9 @@
     @RequiresPermissions("system:permission:query")
     public ApiResponse<List<SystemPermission>> findAllCom () {
         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.setIscom(Constants.ONE);
         systemPermission.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemPermissionService.findList(systemPermission));
+        return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType()));
     }
 }

--
Gitblit v1.9.3