From 2b8a97f707f907e6d183fb257cedbee676a02ffe Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 2 Aug 2024 01:01:22 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E9=99=90=E5=88=B6=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=94=AF=E6=8C=81=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/GeneratorServiceImpl.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
index c4e72cc9..043ca2c0 100644
--- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
@@ -33,6 +33,7 @@ import com.youlai.system.service.GenFieldConfigService;
 import com.youlai.system.service.SysMenuService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
@@ -59,6 +60,9 @@ public class GeneratorServiceImpl implements GeneratorService {
     private final GenConfigConverter genConfigConverter;
     private final SysMenuService menuService;
 
+    @Value("${spring.profiles.active}")
+    private String springProfilesActive ;
+
     /**
      * 数据表分页列表
      *
@@ -124,7 +128,11 @@ public class GeneratorServiceImpl implements GeneratorService {
                             .eq(GenFieldConfig::getConfigId, genConfig.getId())
                             .orderByAsc(GenFieldConfig::getFieldSort)
             );
-            Integer maxSort = fieldConfigList.stream().map(GenFieldConfig::getFieldSort).max(Integer::compareTo).orElseGet(() -> 0);
+            Integer maxSort = fieldConfigList.stream()
+                    .map(GenFieldConfig::getFieldSort)
+                    .filter(Objects::nonNull) // 过滤掉空值
+                    .max(Integer::compareTo)
+                    .orElse(0);
             for (ColumnMetaData tableColumn : tableColumns) {
                 // 根据列名获取字段生成配置
                 String columnName = tableColumn.getColumnName();
@@ -181,7 +189,7 @@ public class GeneratorServiceImpl implements GeneratorService {
 
         // 如果选择上级菜单
         Long parentMenuId = formData.getParentMenuId();
-        if (parentMenuId != null) {
+        if (parentMenuId != null && springProfilesActive.equals("dev") ) {
             menuService.saveMenu(parentMenuId,genConfig);
         }