From e4bcf3cf331ea5172f7c46effe7495fff5cd1f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 3 Jan 2024 10:02:34 +0800
Subject: [PATCH 1/2] 'commit'

---
 .../com/dsideal/QingLong/Collect/Model/CollectModel.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index bb3c3aa4..c1b2f873 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -1097,8 +1097,6 @@ public class CollectModel {
      * 功能：填报者保存填报结果
      */
     public void saveFormJob(int job_id, String bureau_id, String person_id, String table_name, String json) {
-        //需要根据前端传入数据的样例进行修改
-        // TODO
         JSONObject jo = JSONObject.parseObject(json);
         Record record = new Record();
         record.set("job_id", job_id);
@@ -1106,6 +1104,12 @@ public class CollectModel {
         record.set("person_id", person_id);
         for (Map.Entry<String, Object> entry : jo.entrySet()) {
             String key = entry.getKey();
+            /**
+            blockquote：为布局组件，不用设置为字段
+            line：为布局组件，不用设置为字段
+             */
+            if (key.equals("blockquote")) continue;
+            if (key.equals("line")) continue;
             Object value = entry.getValue();
             record.set(key, value);
         }

From 69e42626c574afd73a57f12c6e3b8ba0b1545507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 3 Jan 2024 10:04:02 +0800
Subject: [PATCH 2/2] 'commit'

---
 .../com/dsideal/QingLong/Collect/Model/CollectModel.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index c1b2f873..e4469389 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -1104,12 +1104,6 @@ public class CollectModel {
         record.set("person_id", person_id);
         for (Map.Entry<String, Object> entry : jo.entrySet()) {
             String key = entry.getKey();
-            /**
-            blockquote：为布局组件，不用设置为字段
-            line：为布局组件，不用设置为字段
-             */
-            if (key.equals("blockquote")) continue;
-            if (key.equals("line")) continue;
             Object value = entry.getValue();
             record.set(key, value);
         }