From 91e015fb968a474e63dd22afc814cd1dbd965d2d Mon Sep 17 00:00:00 2001
From: JeeLowCode <jeelowcode@139.com>
Date: Thu, 23 Jan 2025 17:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=BC=BA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enhance/JeeLowCodeAnnotationAspectjJAVA.java     | 11 +++++++----
 .../config/aspect/enhance/model/EnhanceParam.java    | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/JeeLowCodeAnnotationAspectjJAVA.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/JeeLowCodeAnnotationAspectjJAVA.java
index 2598985..38dc06a 100644
--- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/JeeLowCodeAnnotationAspectjJAVA.java
+++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/JeeLowCodeAnnotationAspectjJAVA.java
@@ -19,6 +19,7 @@ import com.jeelowcode.core.framework.config.aspect.enhance.model.*;
 import com.jeelowcode.core.framework.config.aspect.enhance.plugin.*;
 import com.jeelowcode.core.framework.config.listener.JeeLowCodeListener;
 import com.jeelowcode.core.framework.entity.EnhanceJavaEntity;
+import com.jeelowcode.core.framework.params.SaveImportDataParam;
 import com.jeelowcode.core.framework.utils.Func;
 import com.jeelowcode.framework.exception.JeeLowCodeException;
 import com.jeelowcode.framework.utils.model.ExecuteEnhanceModel;
@@ -177,9 +178,6 @@ public class JeeLowCodeAnnotationAspectjJAVA {
                 break;
             }
         }
-        if (Func.isEmpty(context.getResult()) || Func.isEmpty(context.getResult().getRecords())) {
-            return joinPoint.proceed();
-        }
 
         return getResult(context);
     }
@@ -302,6 +300,11 @@ public class JeeLowCodeAnnotationAspectjJAVA {
         param.setDbFormId(dbFormId);
         param.setList((ArrayList) paramMap.getOrDefault("dataList", null));
         param.setParams((Map<String, Object>) paramMap.getOrDefault("params", null));
+        Object importDataParam = paramMap.get("param");
+        if(Func.isNotEmpty(importDataParam) && importDataParam instanceof SaveImportDataParam){
+            param.setImportDataParam((SaveImportDataParam)importDataParam);
+        }
+
 
         //把参数放入到上下文
         EnhanceContext context = new EnhanceContext();
@@ -358,7 +361,7 @@ public class JeeLowCodeAnnotationAspectjJAVA {
                 //环绕-前置
                 PluginManager.executeAroundBeforePlugin(plugin, context);
 
-                if (Func.isEmpty(context.getResult()) || Func.isEmpty(context.getResult().getRecords())) {
+                if (Func.isEmpty(context.getResult())) {
                     context.setResult(new EnhanceResult());
                 }
                 if (context.getResult().isExitFlag()) {//说明终止，不用往下走
diff --git a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/model/EnhanceParam.java b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/model/EnhanceParam.java
index 74ca99b..a75c524 100644
--- a/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/model/EnhanceParam.java
+++ b/jeelowcode-core/src/main/java/com/jeelowcode/core/framework/config/aspect/enhance/model/EnhanceParam.java
@@ -14,6 +14,7 @@ http://www.apache.org/licenses/
 package com.jeelowcode.core.framework.config.aspect.enhance.model;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeelowcode.core.framework.params.SaveImportDataParam;
 
 import java.io.Serializable;
 import java.util.List;
@@ -37,6 +38,9 @@ public class EnhanceParam implements Serializable {
     private Page page;
 
     private List<Long> dataIdList;
+
+    private SaveImportDataParam importDataParam;
+
     public Long getDbFormId() {
         return dbFormId;
     }
@@ -88,6 +92,14 @@ public class EnhanceParam implements Serializable {
         this.dataIdList = dataIdList;
     }
 
+    public SaveImportDataParam getImportDataParam() {
+        return importDataParam;
+    }
+
+    public void setImportDataParam(SaveImportDataParam importDataParam) {
+        this.importDataParam = importDataParam;
+    }
+
     public EnhanceParam(Long dbFormId, Map<String, Object> params, List<Map<String, Object>> list) {
         this.dbFormId = dbFormId;
         this.params = params;