From e51860c4d4a43ef29b473eef8333eb2d5b2995d4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 Jan 2023 21:55:09 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/enterprise/delete/1612364718760767492?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcEnterpriseServiceImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
index 679dde5615..7867b1434b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -280,12 +281,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
      * @param enterpriseId
      * @return
      */
+    @NoRepeatSubmit
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(String enterpriseId, String customerId, String userId) {
         //如果是编辑判断下权限要删除的记录的agencyId要与当前登录用户的agencyId一致
         IcEnterpriseEntity origin = baseDao.selectById(enterpriseId);
-
+        if(null==origin){
+            // 已经不存在了，返回！
+            return;
+        }
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
         if (!staffInfo.getAgencyId().equals(origin.getAgencyId())) {
             AgencyInfoCache orginAgencyInfo = CustomerOrgRedis.getAgencyInfo(origin.getAgencyId());