From 2ac9f2efa945e4bc1708c593704e3e32f4f4f252 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 30 Jun 2022 09:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8A=BF=E8=B5=84=E6=BA=90=E3=80=81?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E3=80=81=E9=87=8D=E7=82=B9?=
 =?UTF-8?q?=E5=8D=B1=E5=8C=96=E3=80=81=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=90=8C=E7=BB=84=E7=BB=87=E4=B8=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=EF=BC=8C=E5=B7=B2=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=B4=E6=8E=A5=E6=9B=B4=E6=96=B0,?=
 =?UTF-8?q?=E6=9C=AA=E6=94=B9=E5=BD=BB=E5=BA=95=EF=BC=8C=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IcCityManagementDao.java  |  1 +
 .../java/com/epmet/dao/IcDangerousChemicalsDao.java   |  2 ++
 .../main/java/com/epmet/dao/IcPublicServiceDao.java   |  2 ++
 .../java/com/epmet/dao/IcSuperiorResourceDao.java     |  2 ++
 .../service/impl/IcCityManagementServiceImpl.java     |  5 ++++-
 .../service/impl/IcDangerousChemicalsServiceImpl.java |  5 ++++-
 .../service/impl/IcPublicServiceServiceImpl.java      |  6 +++++-
 .../service/impl/IcSuperiorResourceServiceImpl.java   |  5 ++++-
 .../src/main/resources/mapper/IcCityManagementDao.xml | 11 +++++++++++
 .../main/resources/mapper/IcDangerousChemicalsDao.xml | 10 ++++++++++
 .../src/main/resources/mapper/IcPublicServiceDao.xml  | 10 ++++++++++
 .../main/resources/mapper/IcSuperiorResourceDao.xml   | 10 ++++++++++
 12 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java
index b22f9734c6..fb9664fa0d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java
@@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
 
     void importInsert(@Param("entityList") List<IcCityManagementEntity> entityList);
 
+    void delByAgencyAndName(IcCityManagementEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
index 5f75264465..cd0758a98f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java
@@ -22,4 +22,6 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
     void del(IcDangerousChemicalsEntity entity);
 
     void importInsert(List<IcDangerousChemicalsEntity> entityList);
+
+    void delByAgencyAndName(IcDangerousChemicalsEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java
index 3f29ecba64..d7ac4b6ef1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java
@@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
     void del(IcPublicServiceEntity entity);
 
     void importInsert(@Param("entityList") List<IcPublicServiceEntity> entityList);
+
+    void delByAgencyAndName(IcPublicServiceEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java
index cbd187c7bf..361cc8c5bf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java
@@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity>
     void del(IcSuperiorResourceEntity entity);
 
     void importInsert(@Param("entityList") List<IcSuperiorResourceEntity> entityList);
+
+    void delByAgencyAndName(IcSuperiorResourceEntity entity);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
index 0562ff6f1e..a8edb5e7cd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java
@@ -170,7 +170,10 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcCityManagementAddEditFormDTO formDTO) {
-        IcCityManagementEntity entity = new IcCityManagementEntity();
+        IcCityManagementEntity entity = baseDao.selectById(formDTO.getIcCityManagementId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcCityManagementId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);
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 a9da5c7e22..c62bad0456 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
@@ -185,7 +185,10 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcDangerousChemicalsAddEditFormDTO formDTO) {
-        IcDangerousChemicalsEntity entity = new IcDangerousChemicalsEntity();
+        IcDangerousChemicalsEntity entity = baseDao.selectById(formDTO.getIcDangerousChemicalsId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcDangerousChemicalsId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
index b822245662..6fd19e5839 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java
@@ -27,6 +27,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
 import com.epmet.dto.result.IcPublicServiceListResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcPublicServiceEntity;
+import com.epmet.entity.IcSuperiorResourceEntity;
 import com.epmet.excel.IcPublicServiceExcel;
 import com.epmet.excel.handler.IcPublicServiceExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -170,7 +171,10 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcPublicServiceAddEditFormDTO formDTO) {
-        IcPublicServiceEntity entity = new IcPublicServiceEntity();
+        IcPublicServiceEntity entity = baseDao.selectById(formDTO.getIcPublicServiceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcPublicServiceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
index e524738d93..25918bbd04 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java
@@ -170,7 +170,10 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcSuperiorResourceAddEditFormDTO formDTO) {
-        IcSuperiorResourceEntity entity = new IcSuperiorResourceEntity();
+        IcSuperiorResourceEntity entity = baseDao.selectById(formDTO.getIcSuperiorResourceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcSuperiorResourceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml
index 22a66aeb56..2ed22909f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml
@@ -106,4 +106,15 @@
             id = #{id}
         AND del_flag = '0'
     </delete>
+
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_city_management
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>
\ No newline at end of file
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 ccaea77ffd..99d3138558 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
@@ -118,4 +118,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_dangerous_chemicals
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml
index 6909d9ea5c..295ee69e36 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml
@@ -107,4 +107,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_public_service
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml
index 0b9d9760f4..8058120afd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml
@@ -107,5 +107,15 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_superior_resource
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 
 </mapper>
\ No newline at end of file