From db360447ad473d0a151896984c63b37414a0793c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 10 Nov 2023 10:59:58 +0800
Subject: [PATCH] fix: 78321
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

海外标准--标准详情--导入的数据国家/地区没有数据回显
---
 .../com/jero/modules/laws/common/util/ImportUtil.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 69c607d8..2eeceeef 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -437,8 +437,6 @@ public class ImportUtil {
                     }
                 }
 
-                // 将转好的值加入Map
-                parameterMap.put(tag.getDbFieldName(), cellValue);
                 // 企标稽查内容文件导入
                 if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
                     if (!this.inspectContentFileValid(cellValue, fileMap)) {
@@ -450,15 +448,21 @@ public class ImportUtil {
                         parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
                     }
                 }
-                // 单选时间
+                // 树形单选
                 if (FieldShowTypeEnum.TREE_STRUCTURE_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) {
                     // 根据tag找到dictCode
                     String dictCode = tag.getDictField();
                     if (!this.dictValid(dictCode, cellValue)) {
                         log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
                         errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
+                    } else {
+                        // 转为id
+                        cellValue = this.convertDictValue(dictCode, cellValue);
                     }
                 }
+
+                // 将转好的值加入Map
+                parameterMap.put(tag.getDbFieldName(), cellValue);
             }
             // 判断实施日期是否大于发布日期15天
             if (releaseDate != null && implementationDate != null) {