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

feat:[REQ-3299] 数据权限增删改新增“是否过滤工程”字段的维护

Browse Source
This commit is contained in:
liuyang 2024-11-27 14:59:52 +08:00
parent 5114ccab38
commit 181d309105
5 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ public class CreateDataObjectReq {
*/
private List<AttributeBO> attrs;
/**
* 是否过滤工程 0否1是
*/
private Integer isFilterProject;
/**
* 默认规则
*/

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

@ -55,6 +55,11 @@ public class EditDataObjectReq {
@Valid
private List<DataObjectRuleBO> dataObjectRuleBOList;
/**
* 是否过滤工程 0否1是
*/
private Integer isFilterProject;
/**
* 排序 （从小到大）
*/

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/res/DataObjectRes.java
View File

@ -46,6 +46,11 @@ public class DataObjectRes {
*/
private List<DataObjectRuleBO> dataObjectRuleBOList;
/**
* 是否过滤工程 0否1是
*/
private Integer isFilterProject;
/**
* 排序 （从小到大）
*/

5
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataObject.java
View File

@ -36,4 +36,9 @@ public class DataObject extends BaseOperatorEntity<DataObject> implements Serial
private Integer tenantScope;
private Integer sort;
/**
* 是否过滤工程
*/
private Integer isFilterProject;
}

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

@ -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<DataObjectAttr> 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<DataObjectAttr> objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));