From 66acb9c18cfa4c2efd0311d0687d647c63d254aa Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 18 Jul 2022 11:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/entity/ParamsCollectManifestBaseEO.java  |  3 ---
 .../impl/ParamsCollectManifestEOServiceImpl.java     | 12 ++++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
index ab5cc26e9..8e42caf35 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
@@ -1,8 +1,6 @@
 package com.jero.modules.cert.collect.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -121,7 +119,6 @@ public class ParamsCollectManifestBaseEO implements Serializable {
     /**工程接口人*/
     @Excel(name = "工程接口人", width = 15)
     @ApiModelProperty(value = "工程接口人")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String sdt;
 
     /**填写人*/
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 3821d7723..3afdc6d0f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -382,7 +382,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			sdtMap.put("id", collectManifestEO.getId());
 			sdtMap.put("state", collectManifestEO.getState());
 			sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
-			sdtMap.put("dataValue", collectManifestEO.getSdt());
+			if (StringUtils.isNotBlank(collectManifestEO.getSdt())) {
+				sdtMap.put("dataValue", collectManifestEO.getSdt());
+			} else {
+				sdtMap.put("dataValue", null);
+			}
 			manifestMap.put("sdt", sdtMap);
 
 			// 配置列名数组
@@ -1227,13 +1231,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				if (ObjectUtil.isNotEmpty(sysUser)) {
 					updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
 				} else {
-					updateEO.setSdt(null); // 设置工程接口人
+					updateEO.setSdt(""); // 设置工程接口人
 				}
 			} else {
-				updateEO.setSdt(null); // 设置工程接口人
+				updateEO.setSdt(""); // 设置工程接口人
 			}
 		} else {
-			updateEO.setSdt(null); // 设置工程接口人
+			updateEO.setSdt(""); // 设置工程接口人
 		}
 
 		return updateById(updateEO);