sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yxk-20260622-bug修复：党委会、把把脉新增时设置del_flag为0，删除时去掉级联删除注解

Browse Source
This commit is contained in:
ye1023
2026-06-22 15:01:20 +08:00
parent bb1f5978b7
commit 8566c0a699
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
-7
View File
@@ -1,9 +1,6 @@
package org.jeecg.modules.demo.bgpartymatter.service.impl; 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.BgPartymatter;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper; import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper; import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper;
import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService; import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService;
@@ -31,10 +28,6 @@ public class BgPartymatterServiceImpl extends ServiceImpl<BgPartymatterMapper, B
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CascadeDelete(sons = {
// 配置子表1：Mapper类 + 子表中关联主表的字段名
@SonTable(mapper = BgPartymatterFeedback.class, joinColumn = "main_id"),
})
public void delMain(String id) { public void delMain(String id) {
bgPartymatterFeedbackMapper.deleteByMainId(id); bgPartymatterFeedbackMapper.deleteByMainId(id);
bgPartymatterMapper.deleteById(id); bgPartymatterMapper.deleteById(id);
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
+6 -2
View File
@@ -80,7 +80,7 @@ public class BgTakepulseServiceImpl extends ServiceImpl<BgTakepulseMapper, BgTak
* 新增入口统一补齐逻辑删除正常值，避免 @TableLogic 将 del_flag 为空的数据过滤掉。 * 新增入口统一补齐逻辑删除正常值，避免 @TableLogic 将 del_flag 为空的数据过滤掉。
*/ */
private void fillDefaultDelFlag(BgTakepulse bgTakepulse) { private void fillDefaultDelFlag(BgTakepulse bgTakepulse) {
if (bgTakepulse != null && bgTakepulse.getDelFlag() == null) { if (bgTakepulse != null && isBlank(bgTakepulse.getDelFlag())) {
bgTakepulse.setDelFlag("0"); bgTakepulse.setDelFlag("0");
} }
} }
@@ -89,9 +89,13 @@ public class BgTakepulseServiceImpl extends ServiceImpl<BgTakepulseMapper, BgTak
* 子表跟随主表保存时也补齐 del_flag，和反馈独立新增接口保持一致。 * 子表跟随主表保存时也补齐 del_flag，和反馈独立新增接口保持一致。
*/ */
private void fillDefaultDelFlag(BgTakepulseFeedback bgTakepulseFeedback) { private void fillDefaultDelFlag(BgTakepulseFeedback bgTakepulseFeedback) {
if (bgTakepulseFeedback != null && bgTakepulseFeedback.getDelFlag() == null) { if (bgTakepulseFeedback != null && isBlank(bgTakepulseFeedback.getDelFlag())) {
bgTakepulseFeedback.setDelFlag("0"); bgTakepulseFeedback.setDelFlag("0");
} }
} }
private boolean isBlank(String value) {
return value == null || value.trim().isEmpty();
}
} }