From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 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 5cbd295..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));
@@ -85,7 +84,7 @@
RulesCondition rulesCondition = new RulesCondition();
rulesCondition.setRuleId(id);
List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
- boolean removeCondition = removeByIds(list);
+ boolean removeCondition = rulesConditionService.removeBatchByIds(list);
return removeRule&&removeCondition;
}
}
--
Gitblit v1.9.3