From 0d08f8b7ffa5dadd8f810929be9bb1f542a73b11 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 2 Feb 2026 19:37:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/GyzjServiceImpl.java     | 33 +++++++++++++++-------
 .../hxhq/business/service/impl/MjyServiceImpl.java | 32 +++++++++++++++------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index 21e7de2..deee514 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -1392,7 +1392,30 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
                     gyzjMap.put(gyzj.getBh(), gyzj);
                 }
             }
+            // 处置、存储
+            czCc(studyFormFill,gyzjMap,jcgjList,tzList,remark,qmr);
         }
+        if(jcgjList.size()>0){
+            gyzjJcgjService.saveBatch(jcgjList);
+        }
+        if(tzList.size()>0){
+            gyzjTzService.saveBatch(tzList);
+        }
+        if(gyzjList.size()>0){
+            studyGyzjService.saveBatch(studyId, gyzjList);
+        }
+    }
+
+    /**
+     * 处置、存储
+     * @param studyFormFill
+     * @param gyzjMap
+     * @param jcgjList
+     * @param tzList
+     * @param remark
+     */
+    public void czCc(StudyFormFill studyFormFill,Map<String, Gyzj> gyzjMap,LinkedList<GyzjJcgj> jcgjList,LinkedList<GyzjTz> tzList, String remark,SysUser qmr){
+        String empty="[]";
         if (gyzjMap.size() > 0) {
             // 存储
             String cclist = studyFormFill.getCclist();
@@ -1445,17 +1468,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
                 }
             }
         }
-        if(jcgjList.size()>0){
-            gyzjJcgjService.saveBatch(jcgjList);
-        }
-        if(tzList.size()>0){
-            gyzjTzService.saveBatch(tzList);
-        }
-        if(gyzjList.size()>0){
-            studyGyzjService.saveBatch(studyId, gyzjList);
-        }
     }
-
     //endregion
 
     //region 档案管理
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
index 00f693f..659128c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
@@ -1295,7 +1295,30 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                     mjyMap.put(mjy.getBh(), mjy);
                 }
             }
+            // 处置、存储
+            czCc(studyFormFill,mjyMap,jcgjList,tzList,remark,qmr);
         }
+        if(jcgjList.size()>0){
+            mjyJcgjService.saveBatch(jcgjList);
+        }
+        if(tzList.size()>0){
+            mjyTzService.saveBatch(tzList);
+        }
+        if(mjyList.size()>0){
+            studyMjyService.saveBatch(studyId, mjyList);
+        }
+    }
+
+    /**
+     * 处置、存储
+     * @param studyFormFill
+     * @param mjyMap
+     * @param jcgjList
+     * @param tzList
+     * @param remark
+     */
+    public void czCc(StudyFormFill studyFormFill,Map<String, Mjy> mjyMap,LinkedList<MjyJcgj> jcgjList,LinkedList<MjyTz> tzList, String remark,SysUser qmr){
+        String empty="[]";
         if (mjyMap.size() > 0) {
             // 存储
             String cclist = studyFormFill.getCclist();
@@ -1348,15 +1371,6 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 }
             }
         }
-        if(jcgjList.size()>0){
-            mjyJcgjService.saveBatch(jcgjList);
-        }
-        if(tzList.size()>0){
-            mjyTzService.saveBatch(tzList);
-        }
-        if(mjyList.size()>0){
-            studyMjyService.saveBatch(studyId, mjyList);
-        }
     }
 
     //endregion