From 8566c0a699d9abc6c732c238a6d5684a438496d0 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Mon, 22 Jun 2026 15:01:20 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260622-bug=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E5=85=9A=E5=A7=94=E4=BC=9A=E3=80=81=E6=8A=8A=E6=8A=8A=E8=84=89?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E8=AE=BE=E7=BD=AEdel=5Fflag?=
 =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=B6=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BgPartymatterServiceImpl.java            | 7 -------
 .../bqtakepulse/service/impl/BgTakepulseServiceImpl.java  | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
index 43c2c68..e3d78b6 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
@@ -1,9 +1,6 @@
 package org.jeecg.modules.demo.bgpartymatter.service.impl;
 
-import org.jeecg.common.aspect.annotation.CascadeDelete;
-import org.jeecg.common.aspect.annotation.SonTable;
 import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
-import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
 import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
 import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper;
 import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService;
@@ -31,10 +28,6 @@ public class BgPartymatterServiceImpl extends ServiceImpl<BgPartymatterMapper, B
 	
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-    @CascadeDelete(sons = {
-            // 配置子表1：Mapper类 + 子表中关联主表的字段名
-            @SonTable(mapper = BgPartymatterFeedback.class, joinColumn = "main_id"),
-    })
 	public void delMain(String id) {
 		bgPartymatterFeedbackMapper.deleteByMainId(id);
 		bgPartymatterMapper.deleteById(id);
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
index dfa5bbe..4d9012a 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
@@ -80,7 +80,7 @@ public class BgTakepulseServiceImpl extends ServiceImpl<BgTakepulseMapper, BgTak
 	 * 新增入口统一补齐逻辑删除正常值，避免 @TableLogic 将 del_flag 为空的数据过滤掉。
 	 */
 	private void fillDefaultDelFlag(BgTakepulse bgTakepulse) {
-		if (bgTakepulse != null && bgTakepulse.getDelFlag() == null) {
+		if (bgTakepulse != null && isBlank(bgTakepulse.getDelFlag())) {
 			bgTakepulse.setDelFlag("0");
 		}
 	}
@@ -89,9 +89,13 @@ public class BgTakepulseServiceImpl extends ServiceImpl<BgTakepulseMapper, BgTak
 	 * 子表跟随主表保存时也补齐 del_flag，和反馈独立新增接口保持一致。
 	 */
 	private void fillDefaultDelFlag(BgTakepulseFeedback bgTakepulseFeedback) {
-		if (bgTakepulseFeedback != null && bgTakepulseFeedback.getDelFlag() == null) {
+		if (bgTakepulseFeedback != null && isBlank(bgTakepulseFeedback.getDelFlag())) {
 			bgTakepulseFeedback.setDelFlag("0");
 		}
 	}
+
+	private boolean isBlank(String value) {
+		return value == null || value.trim().isEmpty();
+	}
 	
 }