From e44a09119d352ac4fdab4c66477c446471f0f6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 18 Nov 2024 14:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhx/module/matter/service/impl/MatterServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
index 06ceaa82..6fd80bb6 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
@@ -1108,6 +1108,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
                 Integer matterEditionRemote = DataUtil.converStr2Int(baseInfoMap.getOrDefault("浜嬮」鐗堟湰", "0"), 0);
 
+                //鐢变簬闄勪欢杩炴帴鏈夋晥鎬э紝寮哄埗鏇存柊鏉愭枡灞炴€т笌闄勪欢鍦板潃
+                saveDatumInfo(matterEntity, context, dom, sqclInfoSetting);
+
                 if (matterEditionLocal >= matterEditionRemote) {
                     return Rest.fail("鏈湴浜嬮」鐗堟湰澶т簬绛変簬杩滅锛屼笉闇€瑕佹洿鏂帮紒");
                 }
@@ -1118,8 +1121,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 matterEntity.setDeptName(extCache == null ? "" : extCache.getName());
                 //鏋勫缓鍩虹淇℃伅鍙傛暟
                 savebaseInfo(matterEntity, baseInfoMap, baseInfoSetting);
-                //鏇存柊鏉愭枡灞炴€�
-                saveDatumInfo(matterEntity, context, dom, sqclInfoSetting);
+
                 //鏇存柊鍙楃悊鏉′欢
                 saveSltjInfo(matterEntity, context, dom);
                 //鏇存柊鍔炵悊娴佺▼
-- 
2.24.3