diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index b6348a8d..bc12f06e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -644,7 +644,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         }
         // 企标授权部门处理
         if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) {
-            esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString());
+            if (parameterMap.get(FieldCommon.AUTH_DEPT) != null) {
+                esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString());
+            }
         }
 
         return MessageUtils.getMessage(ResultCommon.OK);
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 2eeceeef..5494711b 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,17 +437,6 @@ public class ImportUtil {
                     }
                 }
 
-                // 企标稽查内容文件导入
-                if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
-                    if (!this.inspectContentFileValid(cellValue, fileMap)) {
-                        log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
-                        errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
-                    } else {
-                        // 转为List
-                        // 将转好的值加入Map
-                        parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
-                    }
-                }
                 // 树形单选
                 if (FieldShowTypeEnum.TREE_STRUCTURE_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) {
                     // 根据tag找到dictCode
@@ -463,6 +452,19 @@ public class ImportUtil {
 
                 // 将转好的值加入Map
                 parameterMap.put(tag.getDbFieldName(), cellValue);
+
+                // 企标稽查内容文件导入
+                if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
+                    if (!this.inspectContentFileValid(cellValue, fileMap)) {
+                        cellValue = null;
+                        log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
+                        errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
+                    } else {
+                        // 转为List
+                        // 将转好的值加入Map
+                        parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
+                    }
+                }
             }
             // 判断实施日期是否大于发布日期15天
             if (releaseDate != null && implementationDate != null) {
@@ -837,6 +839,7 @@ public class ImportUtil {
                 // 获取第四行前两个单元格的内容
                 String cellContent1 = getCellContent(row.getCell(0));
                 String cellContent2 = getCellContent(row.getCell(1));
+                String cellContent3 = getCellContent(row.getCell(2));
                 // 执行valid方法进行校验
                 if (!valid(cellContent1, cellContent2)) {
                     return false;