From 56638c01bb2cc61a92f5e03c9a1001be5b5d3699 Mon Sep 17 00:00:00 2001
From: P15GEN2\59518 <lilith@highdatas.com>
Date: 星期六, 18 十月 2025 12:39:31 +0800
Subject: [PATCH] dev 数据清洗

---
 foundation.workflow/src/foundation/dao/DataPackage.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/foundation.workflow/src/foundation/dao/DataPackage.java b/foundation.workflow/src/foundation/dao/DataPackage.java
index cf410db..e3737ae 100644
--- a/foundation.workflow/src/foundation/dao/DataPackage.java
+++ b/foundation.workflow/src/foundation/dao/DataPackage.java
@@ -190,7 +190,7 @@
 		for (PackageItem packageItem: slaveItems) {
 			mapping = mappings.get(packageItem.getName());
 			jsonReader = mapping.getJSONReader(packageReader);
-			packageItem.loadOneDataFromJSON(dataId, packageReader, mapping, DataSource.Result);
+			packageItem.loadOneDataFromJSON(dataId, jsonReader, mapping, DataSource.Result);
 		}
 		
 		//3. set state
@@ -451,8 +451,12 @@
 	}
 	
 	public void loadOneDataFromDB() throws Exception {
+		loadOneDataFromDB(false);
+	}
+	
+	public void loadOneDataFromDB(boolean force) throws Exception {
 		DBState dbState = state.getDbState();
-		if (dbState.isOneDataLoaded() || master == null) {
+		if (!force && (dbState.isOneDataLoaded() || master == null)) {
 			return;
 		}
 		

--
Gitblit v1.8.0