wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2299 【开发】 编辑

Browse Source
This commit is contained in:
yangheng 2024-04-23 18:43:29 +08:00
parent a44c4092c2
commit 415f102a23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/CreateDataObjectReq.java
View File

@ -45,7 +45,7 @@ public class CreateDataObjectReq {
/**
* 默认规则
*/
private List<DefaultDataObjectRuleBO> defaultDataObjectRuleBOList;
private DefaultDataObjectRuleBO defaultDataObjectRuleBO;
/**
* 自定义规则
*/

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/EditDataObjectReq.java
View File

@ -44,7 +44,7 @@ public class EditDataObjectReq {
/**
* 默认规则
*/
private List<DefaultDataObjectRuleBO> defaultDataObjectRuleBOList;
private DefaultDataObjectRuleBO defaultDataObjectRuleBO;
/**
* 自定义规则
*/

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java
View File

@ -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<DataObjectAttr> objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(req.getDefaultDataObjectRuleBOList());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));
List<DataObjectRule> dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList());
@ -163,7 +164,7 @@ public class DataObjectServiceImpl implements DataObjectService {
List<DataObjectAttr> objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(req.getDefaultDataObjectRuleBOList());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));
List<DataObjectRule> dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList());
int size = (CollUtil.isNotEmpty(defaultDataObjectRules) ? defaultDataObjectRules.size() : 0)
+ (CollUtil.isNotEmpty(dataObjectRules) ? dataObjectRules.size() : 0);