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

Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

Browse Source
This commit is contained in:
chenwenjian 2023-09-11 18:37:20 +08:00
commit 957070b9fc
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
View File

@ -1,6 +1,8 @@
package cn.axzo.tyr.client.model.permission; package cn.axzo.tyr.client.model.permission;
import cn.axzo.basics.common.model.IBaseTree; import cn.axzo.basics.common.model.IBaseTree;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -51,21 +53,25 @@ public class PermissionPointTreeNode implements IBaseTree<PermissionPointTreeNod
private List<PermissionPointTreeNode> children; private List<PermissionPointTreeNode> children;
@JsonIgnore
@Override @Override
public Long getNodeCode() { public Long getNodeCode() {
return permissionPointId; return permissionPointId;
} }
@JsonIgnore
@Override @Override
public Long getParentNodeCode() { public Long getParentNodeCode() {
return parentId; return parentId;
} }
@JsonIgnore
@Override @Override
public List<PermissionPointTreeNode> getNodeChildren() { public List<PermissionPointTreeNode> getNodeChildren() {
return children; return children;
} }
@JsonIgnore
@Override @Override
public void setNodeChildren(List<PermissionPointTreeNode> nodeChildren) { public void setNodeChildren(List<PermissionPointTreeNode> nodeChildren) {
this.children = nodeChildren; this.children = nodeChildren;

15
tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java
View File

@ -9,6 +9,7 @@ import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper; import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper;
import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper; import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -34,12 +35,14 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
condition.append(" FIND_IN_SET('" + value + "', ou_type_code) OR"); condition.append(" FIND_IN_SET('" + value + "', ou_type_code) OR");
} }
} }
return this.lambdaQuery() LambdaQueryChainWrapper<SaasRoleGroup> eq = this.lambdaQuery()
.in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId,req.getIds()) .in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId, req.getIds())
.in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()),SaasRoleGroup::getWorkspaceTypeCode,req.getWorkspaceTypeCode()) .in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()), SaasRoleGroup::getWorkspaceTypeCode, req.getWorkspaceTypeCode())
.last(CollectionUtils.isNotEmpty(req.getOuTypeCode())," AND (" + condition.substring(0, condition.length() - 2) + ")") .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value);
.eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value) if(CollectionUtils.isNotEmpty(req.getOuTypeCode())){
.list(); eq.last(" AND (" + condition.substring(0, condition.length() - 2) + ")");
}
return eq.list();
} }
} }

4
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
View File

@ -96,7 +96,7 @@ public class PermissionPointServiceImpl implements PermissionPointService {
.collect(Collectors.groupingBy(PermissionPointTreeNode::getTerminal)); .collect(Collectors.groupingBy(PermissionPointTreeNode::getTerminal));
//构建workspace-terminal工作台层级 //构建workspace-terminal工作台层级
List<BasicDictTreeResp> dictList = saasBasicDictService.getBasicDictNodeTree(DictTypeFiledEnum.TERMINAL).getData(); List<BasicDictTreeResp> dictList = saasBasicDictService.getBasicDictNodeTree(DictTypeFiledEnum.TERMINAL).getData();
//遍历所有workspace和terminal //遍历所有workspace和terminal-构建顶层两级
List<PermissionPointTreeNode> result = new ArrayList<>(); List<PermissionPointTreeNode> result = new ArrayList<>();
for (BasicDictTreeResp workspace : dictList) { for (BasicDictTreeResp workspace : dictList) {
List<BasicDictTreeResp> terminals = workspace.getChildren(); List<BasicDictTreeResp> terminals = workspace.getChildren();
@ -122,8 +122,6 @@ public class PermissionPointServiceImpl implements PermissionPointService {
result.add(workspaceNode); result.add(workspaceNode);
} }
} }
return result; return result;
} }