From 181d309105c56296ac34631a45f3965566a089a6 Mon Sep 17 00:00:00 2001 From: liuyang Date: Wed, 27 Nov 2024 14:59:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3299]=20=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=A2=9E=E5=88=A0=E6=94=B9=E6=96=B0=E5=A2=9E=E2=80=9C?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=87=E6=BB=A4=E5=B7=A5=E7=A8=8B=E2=80=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tyr/client/model/req/CreateDataObjectReq.java | 5 +++++ .../tyr/client/model/req/EditDataObjectReq.java | 5 +++++ .../axzo/tyr/client/model/res/DataObjectRes.java | 5 +++++ .../tyr/server/repository/entity/DataObject.java | 5 +++++ .../service/impl/DataObjectServiceImpl.java | 15 ++++++++++++++- 5 files changed, 34 insertions(+), 1 deletion(-) 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 cfa1abf7..dc4c2f01 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,6 +45,11 @@ public class CreateDataObjectReq { */ private List attrs; + /** + * 是否过滤工程 0否1是 + */ + private Integer isFilterProject; + /** * 默认规则 */ 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 becb1985..2c2be87c 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 @@ -55,6 +55,11 @@ public class EditDataObjectReq { @Valid private List dataObjectRuleBOList; + /** + * 是否过滤工程 0否1是 + */ + private Integer isFilterProject; + /** * 排序 （从小到大） */ diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/DataObjectRes.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/DataObjectRes.java index 721bf230..10616f80 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/DataObjectRes.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/DataObjectRes.java @@ -46,6 +46,11 @@ public class DataObjectRes { */ private List dataObjectRuleBOList; + /** + * 是否过滤工程 0否1是 + */ + private Integer isFilterProject; + /** * 排序 （从小到大） */ diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataObject.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataObject.java index fccc9e20..7cd4c201 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataObject.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataObject.java @@ -36,4 +36,9 @@ public class DataObject extends BaseOperatorEntity implements Serial private Integer tenantScope; private Integer sort; + + /** + * 是否过滤工程 + */ + private Integer isFilterProject; } 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 c9d27339..e5c55b7a 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 @@ -4,6 +4,7 @@ import cn.axzo.basics.common.constant.enums.DeleteEnum; import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.basics.common.page.PageResult; import cn.axzo.tyr.client.common.enums.ReturnCodeEnum; +import cn.axzo.tyr.client.common.enums.TenantScopeEnum; import cn.axzo.tyr.client.common.enums.YesNoEnum; import cn.axzo.tyr.client.model.data.object.AttributeBO; import cn.axzo.tyr.client.model.data.object.AttributePermissionBO; @@ -33,6 +34,7 @@ import cn.axzo.tyr.server.repository.entity.DataObjectRuleScope; import cn.axzo.tyr.server.service.DataObjectService; import cn.axzo.tyr.server.utils.mapper.DataObjectMapper; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.EnumUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Lists; @@ -84,6 +86,12 @@ public class DataObjectServiceImpl implements DataObjectService { // 准备 DataObject dataObject = DataObjectMapper.INSTANCE.createReq2DataObject(req); + + // 如果租户类型为非项目租户, 则是否过滤工程字段设置为0 + if (!TenantScopeEnum.WORKSPACE.getValue().equals(dataObject.getTenantScope()) ) { + dataObject.setIsFilterProject(0); + } + dataObject.setCreateBy(req.getCreateBy()); List objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs()); @@ -195,7 +203,12 @@ public class DataObjectServiceImpl implements DataObjectService { dataObject.setTenantScope(req.getTenantScope()); dataObject.setSort(req.getSort()); dataObject.setUpdateBy(req.getUpdateBy()); - + // 如果租户类型为非项目租户, 则是否过滤工程字段设置为0 + if (!TenantScopeEnum.WORKSPACE.getValue().equals(dataObject.getTenantScope()) ) { + dataObject.setIsFilterProject(0); + } else { + dataObject.setIsFilterProject(req.getIsFilterProject()); + } List objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs()); List defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));