Merge remote-tracking branch 'origin/develop' into 主线开发

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);