From fc3704555acfccba4115842b0344240e2fe302d2 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Thu, 30 Mar 2023 16:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarBussStandAttrInfoExecl.java                | 2 ++
 .../service/impl/SarBussionessStandServiceImpl.java      | 9 +++++----
 .../sarResource/service/impl/TsResourceServiceImpl.java  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
index e873891a..cc1a8c35 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
@@ -186,6 +186,8 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
     //备案日期
     private String barq;
 
+    private String menuId;
+
     @TableField(exist = false)
     private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 69d5d75e..767e8b85 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2041,7 +2041,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     public ResponseMessage<String> importSarBussionessStandFile(MultipartFile file,String menuId)throws Exception {
 
          List<TsResource> tsResources  = tsResourceService.getByMenuId(menuId);
-         if (ObjectUtils.isNotEmpty(tsResources)) {
+         if (ObjectUtils.isEmpty(tsResources)) {
+             return Result.error("请选择需要导入的目录");
+         }
              //给出头部信息
              String[] headerExcel = {"企标类别,标准年份,企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--卡车VPPS编码,发布稿附件,编制说明附件,历史版本附件,其他文件附件,修改单附件,关联文件附件,"};
 
@@ -2486,6 +2488,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                      }
                                                  }
 
+                                                 sarBussStandAttrInfo.setMenuId(menuId);
+
                                                  List<SarBussStandAttrInfoExecl> list = new ArrayList<>();
                                                  list.add(sarBussStandAttrInfo);
 
@@ -2516,9 +2520,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                  FileUnZip.deleteDir(saveDirectory);
                  return Result.error("导入失败,没有可导入的数据,请检查!");
              }
-         }else {
-             return Result.error("请选择目录进行导入");
-         }
     }
 
     private static List<File> readImpExcelFile(String path) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
index 418fd126..dc4a8ae9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
@@ -494,7 +494,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
     @Override
     public List<TsResource> getByMenuId(String menuId) throws Exception{
             QueryWrapper<TsResource> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("PARENT_ID",menuId);
+            queryWrapper.eq("ID",menuId);
             List<TsResource> tsResources = baseMapper.selectList(queryWrapper);
             return  tsResources;
     }