From 577d4301f7b7c56a74648a263de89e4b0b6e450f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Feb 2023 13:29:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=97=B6=EF=BC=8C=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcPublicServiceOrgServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java
index cc1dba2e71..7dd3dbc851 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPublicServiceOrgServiceImpl.java
@@ -89,11 +89,11 @@ public class IcPublicServiceOrgServiceImpl extends BaseServiceImpl<IcPublicServi
         checkUnqiueName(formDTO.getName(),formDTO.getAgencyId(),formDTO.getId());
         IcPublicServiceOrgEntity entity=ConvertUtils.sourceToTarget(formDTO,IcPublicServiceOrgEntity.class);
         baseDao.updateById(entity);
+        //先删除
+        LambdaQueryWrapper<IcPublicServiceOrgServiceMatterEntity> deleteWrapper=new LambdaQueryWrapper<>();
+        deleteWrapper.eq(IcPublicServiceOrgServiceMatterEntity::getOrgId,formDTO.getId());
+        icPublicServiceOrgServiceMatterDao.delete(deleteWrapper);
         if(CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())){
-            //先删除
-            LambdaQueryWrapper<IcPublicServiceOrgServiceMatterEntity> deleteWrapper=new LambdaQueryWrapper<>();
-            deleteWrapper.eq(IcPublicServiceOrgServiceMatterEntity::getOrgId,formDTO.getId());
-            icPublicServiceOrgServiceMatterDao.delete(deleteWrapper);
             formDTO.getServiceMatterList().forEach(dto->{
                 IcPublicServiceOrgServiceMatterEntity serviceOrgServiceMatterEntity=ConvertUtils.sourceToTarget(dto,IcPublicServiceOrgServiceMatterEntity.class);
                 serviceOrgServiceMatterEntity.setOrgId(entity.getId());