From a3d574ee0bfb9c16cdc384721a573da01bebe773 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 23 Apr 2023 18:10:09 +0800
Subject: [PATCH] try

---
 .../service/impl/IcDangerousChemicalsServiceImpl.java    | 9 +++++++++
 .../main/resources/mapper/IcDangerousChemicalsDao.xml    | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

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 7f9a88eecb..25cfb3b0e0 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
@@ -21,6 +21,7 @@ import com.epmet.dao.IcDangerousChemicalsDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcDangerousChemicalsDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
@@ -123,6 +124,14 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
                 if (StringUtils.isNotBlank(v.getDangerType())) {
                     v.setDangerTypeName(statusMap.get(v.getDangerType()));
                 }
+                if(OrgTypeEnum.GRID.getCode().equals(v.getOrgType())){
+                    BelongGridNameFormDTO belongGridNameFormDTO=new BelongGridNameFormDTO();
+                    belongGridNameFormDTO.setGridId(v.getOrgId());
+                    v.setOrgName(customerGridService.getGridNameByGridId(belongGridNameFormDTO).getBelongsGridName());
+                }else if(OrgTypeEnum.AGENCY.getCode().equals(v.getOrgType())){
+                    v.setOrgName(customerAgencyService.getAgencyName(v.getOrgId()));
+                }
+
             }
         }
 
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 f3bc3890e2..74315f5a92 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
@@ -73,12 +73,6 @@
             dc.ORG_ID orgId,
             dc.org_type orgType,
             dc.org_id_path as orgIdPath,
-            (
-             case when dc.org_type='grid'then select concat(a.ORGANIZATION_NAME,'-',cg.GRID_NAME) from customer_grid cg inner join customer_agency a on(cg.pid=a.id) where cg.id=dc.org_id
-                when dc.org_type='agency' then select dc.ORGANIZATION_NAME from customer_agency ca where ca.id=dc.org_id
-                else ''
-                end
-            ) as orgName,
             dc.agency_id agencyId,
             dc.source_type sourceType,
             dc.`name` name,
@@ -94,6 +88,7 @@
             dc.remark remark,
             dc.SECURITY_FLAG securityFlag,
             dc.SECURITY_PRINCIPAL_NAME securityPrincipalName,
+            dc.SECURITY_PRINCIPAL_MOBILE securityPrincipalMobile,
             dc.BQ_LD bqLd,
             dc.BQ_GB bqGb,
             dc.COMPANY_PROFILE companyProfile