From afd373f8a0f2ed67ea10c935b9c40b5d726a728d Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Tue, 26 Sep 2023 21:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/app/impl/AppRepositoryCustomizedImpl.java | 2 +- .../topiam/employee/portal/controller/AppController.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java index 48bee84b..ec97e1fa 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java @@ -161,7 +161,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { Map paramMap = new HashMap<>(16); paramMap.put("subjectIds", paramList); StringBuilder builder = new StringBuilder( - "SELECT count(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '" + "SELECT COUNT(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '" + ALL_ACCESS.getCode() + "')"); return namedParameterJdbcTemplate.queryForObject(builder.toString(), paramMap, Long.class); //@formatter:off diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java index 6a5e126a..a904457b 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java @@ -58,13 +58,11 @@ public class AppController { */ @Operation(summary = "获取应用数量") @GetMapping(value = "/count") - public ApiRestResult getAppCount(String groupId) { + public ApiRestResult getAppCount() { Long count; - if (StringUtils.isEmpty(groupId)) { + count = appService.getAppCount(); - } else { - count = appService.getAppCount(groupId); - } + return ApiRestResult.ok(count.toString()); }