From 3f7e26aed95ed3e5a3b561047f14f40c8d09be35 Mon Sep 17 00:00:00 2001
From: shao1121353141 <>
Date: Wed, 13 Sep 2023 16:14:17 +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

---
 .../topiam/employee/portal/converter/AppGroupConverter.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java
index 08428eba..6cc47f05 100644
--- a/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java
+++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java
@@ -20,6 +20,7 @@ package cn.topiam.employee.portal.converter;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.querydsl.core.types.ExpressionUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -47,7 +48,7 @@ public interface AppGroupConverter {
      */
     default Predicate queryPredicate() {
         QAppGroupEntity appGroup = QAppGroupEntity.appGroupEntity;
-        Predicate predicate = appGroup.deleted.eq(Boolean.FALSE);
+        Predicate predicate = ExpressionUtils.and(appGroup.isNotNull(), appGroup.deleted.eq(Boolean.FALSE));
         //@formatter:on
         return predicate;
     }
@@ -59,7 +60,7 @@ public interface AppGroupConverter {
      */
     default Predicate queryAppGroupAssociationPredicate() {
         QAppGroupAssociationEntity appGroupAssociation = QAppGroupAssociationEntity.appGroupAssociationEntity;
-        return appGroupAssociation.deleted.eq(Boolean.FALSE);
+        return ExpressionUtils.and(appGroupAssociation.isNotNull(), appGroupAssociation.deleted.eq(Boolean.FALSE));
     }
 
     /**