From 3c6b0591e42a7ed74c84e8e99ac76b990ad31fd8 Mon Sep 17 00:00:00 2001
From: xiuchen <729048330@qq.com>
Date: Tue, 14 May 2024 12:00:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmaven=20install?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
eiam-application/eiam-application-all/pom.xml | 2 +-
.../eiam-authentication-all/pom.xml | 2 +-
.../app/impl/AppRepositoryCustomizedImpl.java | 22 ++++++++++++++-----
.../eiam-identity-source-all/pom.xml | 2 +-
eiam-protocol/eiam-protocol-all/pom.xml | 2 +-
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/eiam-application/eiam-application-all/pom.xml b/eiam-application/eiam-application-all/pom.xml
index d8506ba8..4e225f97 100644
--- a/eiam-application/eiam-application-all/pom.xml
+++ b/eiam-application/eiam-application-all/pom.xml
@@ -27,7 +27,7 @@
<version>1.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<artifactId>eiam-application-all</artifactId>
diff --git a/eiam-authentication/eiam-authentication-all/pom.xml b/eiam-authentication/eiam-authentication-all/pom.xml
index ca50d39c..4c24118c 100644
--- a/eiam-authentication/eiam-authentication-all/pom.xml
+++ b/eiam-authentication/eiam-authentication-all/pom.xml
@@ -27,7 +27,7 @@
<version>1.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<artifactId>eiam-authentication-all</artifactId>
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 81b56ebe..3af37b89 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
@@ -1,8 +1,19 @@
/*
- * Copyright (c) 2022-Present. Jinan Yuanchuang Network Technology Co., Ltd.
- * All rights reserved.
- * 项目名称：TOPIAM 企业数字身份管控平台
- * 版权说明：本软件属济南源创网络科技有限公司所有，受著作权法和国际版权条约的保护。在未获得济南源创网络科技有限公司正式授权情况下，任何企业和个人，未经授权擅自复制、修改、分发本程序的全部或任何部分，将要承担一切由此导致的民事或刑事责任。
+ * eiam-common - Employee Identity and Access Management
+ * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package cn.topiam.employee.common.repository.app.impl;
@@ -51,11 +62,10 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
app.template,app.protocol,app.type,app.icon,app.initLoginUrl,app.authorizationType,app.enabled,LISTAGG(DISTINCT ass.groupId,","))
FROM
AppEntity app
- LEFT JOIN AppAccessPolicyEntity appAcce ON app.id = appAcce.appId
+ LEFT JOIN AppAccessPolicyEntity appAcce ON app.id = appAcce.appId AND appAcce.enabled = true
LEFT JOIN AppGroupAssociationEntity ass ON app.id = ass.app.id
WHERE
app.enabled = true
- AND appAcce.enabled = true
AND (appAcce.subjectId IN (:subjectIds) OR app.authorizationType = :type)
GROUP BY app.id
""";
diff --git a/eiam-identity-source/eiam-identity-source-all/pom.xml b/eiam-identity-source/eiam-identity-source-all/pom.xml
index 1edd4784..59858b5b 100644
--- a/eiam-identity-source/eiam-identity-source-all/pom.xml
+++ b/eiam-identity-source/eiam-identity-source-all/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<artifactId>eiam-identity-source-all</artifactId>
<dependencies>
diff --git a/eiam-protocol/eiam-protocol-all/pom.xml b/eiam-protocol/eiam-protocol-all/pom.xml
index ba863d20..1f50d040 100644
--- a/eiam-protocol/eiam-protocol-all/pom.xml
+++ b/eiam-protocol/eiam-protocol-all/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>eiam-protocol-all</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>cn.topiam</groupId>