From 7d0d7273aecac8982663e9801bd8f6b30a048c71 Mon Sep 17 00:00:00 2001
From: smallbun <2689170096@qq.com>
Date: Wed, 13 Sep 2023 22:10:37 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/repository/app/AppGroupAssociationRepository.java | 1 -
 .../app/AppGroup/components/UpdateModal/UpdateModal.tsx      | 3 +++
 .../topiam/employee/portal/converter/AppGroupConverter.java  | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppGroupAssociationRepository.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppGroupAssociationRepository.java
index 2ef21deb..fd844a4f 100644
--- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppGroupAssociationRepository.java
+++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppGroupAssociationRepository.java
@@ -52,7 +52,6 @@ public interface AppGroupAssociationRepository extends
                    + " WHERE app_id = :appId and group_id = :groupId", nativeQuery = true)
     void deleteByGroupIdAndAppId(@Param("groupId") Long groupId, @Param("appId") Long appId);
 
-
     /**
      * 根据应用ID删除关联信息
      *
diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppGroup/components/UpdateModal/UpdateModal.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppGroup/components/UpdateModal/UpdateModal.tsx
index 2b441811..91aebe2d 100644
--- a/eiam-console/src/main/console-fe/src/pages/app/AppGroup/components/UpdateModal/UpdateModal.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/app/AppGroup/components/UpdateModal/UpdateModal.tsx
@@ -80,6 +80,9 @@ export default (props: {
               }),
             },
           ]}
+          fieldProps={{
+            maxLength: 8,
+          }}
         />
         <ProFormText
           label={intl.formatMessage({ id: 'pages.app_group.modal_form.name' })}
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 d96e2b62..51ec79a5 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,10 +20,10 @@ 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;
 
+import com.querydsl.core.types.ExpressionUtils;
 import com.querydsl.core.types.Predicate;
 
 import cn.topiam.employee.common.entity.app.AppGroupAssociationEntity;
@@ -58,7 +58,8 @@ public interface AppGroupConverter {
      */
     default Predicate queryAppGroupAssociationPredicate() {
         QAppGroupAssociationEntity appGroupAssociation = QAppGroupAssociationEntity.appGroupAssociationEntity;
-        return ExpressionUtils.and(appGroupAssociation.isNotNull(), appGroupAssociation.deleted.eq(Boolean.FALSE));
+        return ExpressionUtils.and(appGroupAssociation.isNotNull(),
+            appGroupAssociation.deleted.eq(Boolean.FALSE));
     }
 
     /**