Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 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()));
    }
}