add[project]: 所有项目中,只能看到自己参与的项目
This commit is contained in:
@@ -525,8 +525,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
int total;
|
||||
// type=0,查询所有,使用原有查询逻辑
|
||||
if (type == null || type == 0) {
|
||||
nodeList = nodeMapper.getNodeList(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
|
||||
tenantId, pos, limit, userId);
|
||||
nodeList = nodeMapper.getNodeListByUserId(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
|
||||
tenantId, pos, limit,userId,type);
|
||||
// 设置关注标签
|
||||
if (CollectionUtils.isNotEmpty(nodeList)) {
|
||||
List<String> nodeIdList = nodeList.stream().map(SpdmNodeVo::getUuid).toList();
|
||||
@@ -541,7 +541,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
}
|
||||
}
|
||||
}
|
||||
total = nodeMapper.getNodeListCount(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), tenantId);
|
||||
total = nodeMapper.getNodeListCountByUserId(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), tenantId,userId,type);
|
||||
}else if (type == 1){
|
||||
nodeList = nodeMapper.getNodeListByUserId(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
|
||||
tenantId, pos, limit,userId,type);
|
||||
|
||||
@@ -937,13 +937,13 @@
|
||||
SELECT distinct sn.*, IFNULL(pin.pinnedType, 0) as pinnedType, pin.pinnedTime
|
||||
FROM simulation_node sn
|
||||
LEFT JOIN simulation_node_member snm ON sn.uuid = snm.nodeId
|
||||
and snm.user_id = #{userId}
|
||||
LEFT JOIN (
|
||||
SELECT nodeId, 1 as pinnedType, create_time as pinnedTime
|
||||
FROM simulation_node_member
|
||||
WHERE user_id = #{userId} AND type = 2
|
||||
) pin ON sn.uuid = pin.nodeId
|
||||
where sn.tenantId = #{tenantId}
|
||||
where snm.user_id = #{userId}
|
||||
and sn.tenantId = #{tenantId}
|
||||
<choose>
|
||||
<!-- 我关注的 -->
|
||||
<when test="type == 1">
|
||||
@@ -984,8 +984,8 @@
|
||||
FROM simulation_node sn
|
||||
LEFT JOIN simulation_node_member snm
|
||||
ON sn.uuid = snm.nodeId
|
||||
and snm.user_id = #{userId}
|
||||
where sn.tenantId = #{tenantId}
|
||||
where snm.user_id = #{userId}
|
||||
and sn.tenantId = #{tenantId}
|
||||
<choose>
|
||||
<!-- 我关注的 -->
|
||||
<when test="type == 1">
|
||||
|
||||
Reference in New Issue
Block a user