From bd85f798676f50bc67b49c08d43487361cf1aa73 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 11:04:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java  | 2 +-
 .../java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java   | 2 +-
 .../java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java   | 2 +-
 .../java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
index 2b585a9..fe50c68 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
@@ -690,7 +690,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
                 baseMapper.updateBdnr(form.getId(), form.getBdnr(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"), bdnr.getString("sywzmc"), bdnr.getString("xynd"), bdnr.getDate("xysj"));
             }
             //稽查轨迹
-            if (StringUtils.isNoneBlank(form.getFiledValue())) {
+            if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
                 StudyFormApply studyFormApplyOld = this.getById(form.getId());
                 JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
                 List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
index c1dc9b1..6d2216f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
@@ -929,7 +929,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
         //稽查轨迹
-        if (StringUtils.isNoneBlank(form.getFiledValue())) {
+        if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormFill studyFormFillOld = this.getById(form.getId());
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
             List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
index 6515394..c450d14 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
@@ -397,7 +397,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
         //稽查轨迹
-        if (StringUtils.isNoneBlank(form.getFiledValue())) {
+        if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormPlan studyFormPlanOld = this.getById(form.getId());
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
             List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index c8eeb48..e423851 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -537,7 +537,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         }
         //稽查轨迹
 
-        if (StringUtils.isNoneBlank(form.getFiledValue())) {
+        if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
             StudyFormPre studyFormPreOld = this.getById(form.getId());
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
             List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();