From 142bcc9b22f48a8a2098a66b2964fe10c97c6fe8 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 20 五月 2025 11:19:49 +0800 Subject: [PATCH] git ch --- server/platform/src/main/java/com/doumee/api/system/SystemPermissionController.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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..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 @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -86,8 +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.setIsadmin(Constants.ONE); systemPermission.setDeleted(Boolean.FALSE); - return ApiResponse.success(systemPermissionService.findList(systemPermission)); + return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType())); } @ApiOperation("鏌ヨ鎵�鏈�") @@ -95,8 +98,9 @@ @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.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