diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java b/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java index c8628957..7a4c26c0 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java @@ -64,6 +64,9 @@ public class SimulationWork implements Serializable { @TableField(exist = false) private CIDUserResp ownerValue; + @TableField(exist = false) + private String ownerStr; + @ApiModelProperty(value = "描述") @TableField("description") private String description; diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 56dd1400..81c63faa 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -626,13 +626,6 @@ public class NodeServiceImpl extends ServiceImpl NodeTypeEnum.PROJECT.getValue().equals(node.getNodeType())).findFirst().orElse(null); List addPhaseNodeList = addNodeList.stream().filter(node -> NodeTypeEnum.PHASE.getValue().equals(node.getNodeType())).toList(); List addMachineNodeList = addNodeList.stream().filter(node -> NodeTypeEnum.MACHINE.getValue().equals(node.getNodeType())).toList(); diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java index 92435bc4..2f4d2800 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java @@ -137,6 +137,7 @@ public class SimulationWorkServiceImpl extends ServiceImpl page = new PageInfo<>(workList); return PageUtils.getJsonObjectSdmResponse(workList, page); diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index eedeab1e..5bebe998 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -504,7 +504,7 @@ public class TaskServiceImpl implements ITaskService { taskMemberVoList = mapper.getMemberList(taskList.stream().map(SpdmTaskVo::getUuid).toList(), null); - if (CollectionUtils.isNotEmpty(taskMemberVoList)) { + if (type != 1 && CollectionUtils.isNotEmpty(taskMemberVoList)) { if (ObjectUtils.isNotEmpty(req.getPMemberList())) { List pMemberIdList = Stream.of(req.getPMemberList().split(",")).map(Long::valueOf).toList(); // 通过仿真负责人过滤