From 415f102a23f02b9bffe63557afd64c4376e451c6 Mon Sep 17 00:00:00 2001 From: yangheng <1792539268@qq.com> Date: Tue, 23 Apr 2024 18:43:29 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2299=20=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/model/req/CreateDataObjectReq.java | 2 +- .../java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java | 2 +- .../axzo/tyr/server/service/impl/DataObjectServiceImpl.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/CreateDataObjectReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/CreateDataObjectReq.java index 858009f4..1fa7a17e 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/CreateDataObjectReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/CreateDataObjectReq.java @@ -45,7 +45,7 @@ public class CreateDataObjectReq { /** * 默认规则 */ - private List defaultDataObjectRuleBOList; + private DefaultDataObjectRuleBO defaultDataObjectRuleBO; /** * 自定义规则 */ diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java index 3908dc14..6f309cfb 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java @@ -44,7 +44,7 @@ public class EditDataObjectReq { /** * 默认规则 */ - private List defaultDataObjectRuleBOList; + private DefaultDataObjectRuleBO defaultDataObjectRuleBO; /** * 自定义规则 */ diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java index 3e5ce9ff..ca9d1274 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java @@ -32,6 +32,7 @@ import cn.axzo.tyr.server.service.DataObjectService; import cn.axzo.tyr.server.utils.mapper.DataObjectMapper; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -74,7 +75,7 @@ public class DataObjectServiceImpl implements DataObjectService { List objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs()); - List defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(req.getDefaultDataObjectRuleBOList()); + List defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO())); List dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList()); @@ -163,7 +164,7 @@ public class DataObjectServiceImpl implements DataObjectService { List objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs()); - List defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(req.getDefaultDataObjectRuleBOList()); + List defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO())); List dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList()); int size = (CollUtil.isNotEmpty(defaultDataObjectRules) ? defaultDataObjectRules.size() : 0) + (CollUtil.isNotEmpty(dataObjectRules) ? dataObjectRules.size() : 0);