租户体系修改
This commit is contained in:
@@ -28,9 +28,5 @@ public interface SimulationDemandMapper {
|
||||
|
||||
List<SpdmDemandMemberVo> getMemberList(@Param("demandIdList") List<String> demandIdList, @Param("memberType") Integer memberType);
|
||||
|
||||
// List<SpdmUserVo> getUserList(@Param("userIdList") List<Long> userIdList);
|
||||
|
||||
SpdmUserVo getUserByJobNumber(@Param("jobNumber") Long jobNumber);
|
||||
|
||||
SpdmDemandVo getDemandByName(@Param("tenantId") Long tenantId,@Param("demandName") String demandName);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ import com.sdm.common.entity.pojo.BaseEntity;
|
||||
import com.sdm.project.model.po.ProjectNodeExtraPo;
|
||||
import com.sdm.project.model.po.TaskNodeExtraPo;
|
||||
import com.sdm.project.model.po.TaskNodeMemberPo;
|
||||
import com.sdm.project.model.vo.SpdmUserVo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.sdm.project.model.vo;
|
||||
|
||||
import com.sdm.common.entity.pojo.BaseEntity;
|
||||
import com.sdm.common.entity.resp.system.CIDUserResp;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
@@ -87,9 +88,9 @@ public class SpdmNodeDetailVo extends BaseEntity {
|
||||
/**
|
||||
* 团队成员
|
||||
*/
|
||||
List<SpdmUserVo> memberList;
|
||||
List<CIDUserResp> memberList;
|
||||
|
||||
private SpdmUserVo creatorObj;
|
||||
private CIDUserResp creatorObj;
|
||||
|
||||
private String exeStatus;
|
||||
|
||||
|
||||
@@ -400,7 +400,6 @@ public class TaskServiceImpl implements ITaskService {
|
||||
if (CollectionUtils.isNotEmpty(attentionMemberList)) {
|
||||
attentionMap = attentionMemberList.stream().collect(Collectors.groupingBy(SpdmTaskAttentionMemberVo::getTaskId));
|
||||
}
|
||||
Map<Long, List<SpdmUserVo>> userMap = Map.of();
|
||||
List<SpdmTaskMemberVo> eachTaskMemberList;
|
||||
for (SpdmTaskVo task : taskList) {
|
||||
for (String tag : tagList) {
|
||||
|
||||
Reference in New Issue
Block a user