From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
index c61b5de..0069f80 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
@@ -24,7 +24,6 @@
public class RulesServiceImpl extends BaseServiceImpl<RulesMapper, Rules> implements IRulesService {
private final IRulesConditionService rulesConditionService;
-
@Override
public IPage<Rules> selectRulesPage(IPage<Rules> page, Rules rules) {
return page.setRecords(baseMapper.selectRulesPage(page,rules));
@@ -77,4 +76,15 @@
return rulesVO;
}
+
+ @Override
+ @Transactional
+ public Boolean customizeRemove(String id) {
+ boolean removeRule = removeById(id);
+ RulesCondition rulesCondition = new RulesCondition();
+ rulesCondition.setRuleId(id);
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ boolean removeCondition = rulesConditionService.removeBatchByIds(list);
+ return removeRule&&removeCondition;
+ }
}
--
Gitblit v1.9.3