From 52159052de84abcc98885599212c2483f1b4bc8e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 16 Mar 2022 17:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=8C=87=E6=A0=87=E5=BA=93=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=BD=91=E6=A0=BC=E6=97=B6=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenCustomerGridServiceImpl.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index d184f762d1..9249ad678a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -124,7 +124,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 screenGrid.setCode(grid.getCode());
                 screenCustomerGridDao.updateById(screenGrid);
 
-                if ("1".equals(grid.getDelFlag())) {
+                if ("1".equals(grid.getDelFlag()) || grid.getAbandonFlag().compareTo(1) == 0) {
                     LambdaQueryWrapper<ScreenCustomerGridEntity> w = new LambdaQueryWrapper<>();
                     w.eq(ScreenCustomerGridEntity::getGridId, grid.getId());
                     screenCustomerGridDao.delete(w);