From 606b43f809763fe1d7944935aac305e79eb557b0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Apr 2023 11:14:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/excel/IcDangerousChemicalsExcel.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
index ee012d722e..4f1dd34ad2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
@@ -49,7 +49,7 @@ public class IcDangerousChemicalsExcel {
     @ColumnWidth(25)
     private String securityPrincipalName;
 
-    @ExcelProperty(value = "安全负责电话")
+    @ExcelProperty(value = "安全负责人电话")
     @ColumnWidth(25)
     private String securityPrincipalMobile;
 

From d8c4752ea6d0731aaded8b03c8b98ec2e0702e04 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Apr 2023 12:38:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/model/DangerousChemicalsModel.java  | 6 +++---
 .../epmet/service/impl/IcDangerousChemicalsServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/IcDangerousChemicalsDao.xml   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java
index 07b3813ed4..d18dd7566a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java
@@ -28,8 +28,8 @@ public class DangerousChemicalsModel {
     @ExcelProperty(value = "企业名称")
     private String name;
 
-    @NotBlank(message = "企业类型不能为空")
-    @ExcelProperty(value = "企业类型")
+    @NotBlank(message = "企业类别不能为空")
+    @ExcelProperty(value = "企业类别")
     private String categoryName;
 
     /**
@@ -168,7 +168,7 @@ public class DangerousChemicalsModel {
         /**
          * 灵山：企业介绍
          */
-        @ColumnWidth(5)
+        @ColumnWidth(50)
         @ExcelProperty(value = "企业介绍")
         private String companyProfile;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
index 42e644d84d..4bb95cf9a0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
@@ -258,7 +258,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             String staffAgencyPath=PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(),staffAgencyInfo.getPids());
             //危化品种类字典
             Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode());
-            if (!statusRes.success() || MapUtils.isNotEmpty(statusRes.getData())) {
+            if (!statusRes.success() || MapUtils.isEmpty(statusRes.getData())) {
                 throw new EpmetException("获取IC_DANGER_TYPE字典表失败");
             }
             Map<String, String> dangerTypeMap = statusRes.getData();
@@ -326,7 +326,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             importFinishTaskForm.setTaskId(importTaskId);
             importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
             importFinishTaskForm.setOperatorId(tokenDto.getUserId());
-            importFinishTaskForm.setResultDesc("导入失败");
+            importFinishTaskForm.setResultDesc("导入失败"+errorMsg);
 
             Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml
index 74315f5a92..936cda737e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml
@@ -104,7 +104,7 @@
         </if>
         <if test='orgType == "agency"'>
             <if test="orgIdPath != null and orgIdPath != '' ">
-                AND dc.org_id_path like concat(#{orgIdPath},'%')
+                AND dc.AGENCY_ID_PATH like concat(#{orgIdPath},'%')
             </if>
         </if>
         <if test='orgType == "grid"'>