From fd3827e3f3a3be6ab3cbc10862747d097bd64aa5 Mon Sep 17 00:00:00 2001 From: shao1121353141 <> Date: Tue, 26 Sep 2023 21:26:40 +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 --- .../impl/AppGroupRepositoryCustomizedImpl.java | 16 +++++++--------- .../app/impl/AppRepositoryCustomizedImpl.java | 1 - .../console/pojo/result/app/AppGetResult.java | 3 --- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java index 3af199f2..a09d38ee 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java @@ -22,13 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import cn.topiam.employee.common.entity.account.OrganizationMemberEntity; -import cn.topiam.employee.common.entity.account.UserGroupMemberEntity; -import cn.topiam.employee.common.entity.app.AppEntity; -import cn.topiam.employee.common.repository.account.OrganizationMemberRepository; -import cn.topiam.employee.common.repository.account.UserGroupMemberRepository; -import cn.topiam.employee.common.repository.app.impl.mapper.AppEntityMapper; -import com.google.common.collect.Lists; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; @@ -38,14 +31,19 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Repository; +import com.google.common.collect.Lists; + +import cn.topiam.employee.common.entity.account.OrganizationMemberEntity; +import cn.topiam.employee.common.entity.account.UserGroupMemberEntity; import cn.topiam.employee.common.entity.account.query.UserGroupMemberListQuery; import cn.topiam.employee.common.entity.app.po.AppGroupPO; import cn.topiam.employee.common.entity.app.query.AppGroupQuery; +import cn.topiam.employee.common.repository.account.OrganizationMemberRepository; +import cn.topiam.employee.common.repository.account.UserGroupMemberRepository; import cn.topiam.employee.common.repository.app.AppGroupRepositoryCustomized; import cn.topiam.employee.common.repository.app.impl.mapper.AppGroupPoMapper; import lombok.AllArgsConstructor; - import static cn.topiam.employee.common.enums.app.AuthorizationType.ALL_ACCESS; /** @@ -143,7 +141,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto Map paramMap = new HashMap<>(16); paramMap.put("subjectIds", paramList); //@formatter:off - StringBuilder builder = new StringBuilder("SELECT DISTINCT app.* FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.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()+"')"); + 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' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.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()+"')"); builder.append(" AND ass.group_id = ").append(groupId); return namedParameterJdbcTemplate.queryForObject(builder.toString(), paramMap, Long.class); 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 05f7c4da..48bee84b 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 @@ -43,7 +43,6 @@ import cn.topiam.employee.common.repository.app.AppRepositoryCustomized; import cn.topiam.employee.common.repository.app.impl.mapper.AppEntityMapper; import lombok.AllArgsConstructor; - import static cn.topiam.employee.common.enums.app.AuthorizationType.ALL_ACCESS; /** diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/app/AppGetResult.java b/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/app/AppGetResult.java index 9872ea17..2ae9d74a 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/app/AppGetResult.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/app/AppGetResult.java @@ -24,9 +24,6 @@ import java.util.List; import cn.topiam.employee.common.enums.app.AppProtocol; import cn.topiam.employee.common.enums.app.AppType; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import io.swagger.v3.oas.annotations.Parameter;