From 86b9eabd038e145fabb41bd0cd5401cebec0799d Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 22 Mar 2022 17:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9-=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E6=95=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 3 ++-
 .../slrs/processModel/service/impl/IExportServiceImpl.java  | 6 +++---
 .../controller/SarStandardsInfoController.java              | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java
index 1eb26d04..4f8ae795 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java
@@ -19,9 +19,10 @@ public class importExcelDTO {
 
     private String unitName;
 
-    @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0)
+
     private String unit;
 
+    @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0)
     private String drafterName;
 
     @Excel(name = "起草人" , orderNum = "4", width = 20.0)
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java
index bc529903..675a4bf6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java
@@ -73,9 +73,9 @@ public class IExportServiceImpl implements IExportService {
                     stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；");
                 }
             }
-            if (null!=importExcelDTO.getUnit() && !"".equals(importExcelDTO.getUnit())){
-                importExcelDTO.setUnitName(tsInstitutionMap.get(importExcelDTO.getUnit()));
-                if (null==tsInstitutionMap.get(importExcelDTO.getUnit())){
+            if (null!=importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())){
+                importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName()));
+                if (null==tsInstitutionMap.get(importExcelDTO.getUnitName())){
                     stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；");
                 }
             }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 1e6dc360..4282d025 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -233,7 +233,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 //                    sarAdvanceSearchVO.setField("STAND_SYSTEM");
 //                }
 //            });
-            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
             if (StringUtils.isNotBlank(advanceStr)) {
                 page.setAdvanceSearchStr(advanceStr);
             } else {