|
|
@ -148,7 +148,8 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
// 重新分配资源
|
|
|
|
// 重新分配资源
|
|
|
|
ClueQueryCriteria clueQueryCriteria = new ClueQueryCriteria();
|
|
|
|
ClueQueryCriteria clueQueryCriteria = new ClueQueryCriteria();
|
|
|
|
clueQueryCriteria.setMemberId(userId);
|
|
|
|
clueQueryCriteria.setMemberId(userId);
|
|
|
|
clueQueryCriteria.setUserIds((Set<Long>) organizeMemberId);
|
|
|
|
Set<Long> organizeMemberIdSet = new HashSet<>(organizeMemberId);
|
|
|
|
|
|
|
|
clueQueryCriteria.setUserIds(organizeMemberIdSet);
|
|
|
|
sourceClueClient.queryOrganizeIdList(clueQueryCriteria);
|
|
|
|
sourceClueClient.queryOrganizeIdList(clueQueryCriteria);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -315,7 +316,8 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
public TaskOrganize queryDetails(OrganizeQueryCriteria organizeQueryCriteria) {
|
|
|
|
public TaskOrganize queryDetails(OrganizeQueryCriteria organizeQueryCriteria) {
|
|
|
|
TaskOrganize updateTaskOrganize = taskOrganizeRepository.findByOrganizeIdAndTaskId(organizeQueryCriteria.getOrganizeId(), organizeQueryCriteria.getTaskId());
|
|
|
|
TaskOrganize updateTaskOrganize = taskOrganizeRepository.findByOrganizeIdAndTaskId(organizeQueryCriteria.getOrganizeId(), organizeQueryCriteria.getTaskId());
|
|
|
|
Set<Long> memberIdList = sourceClueClient.findMemberIdList(organizeQueryCriteria).getBody();
|
|
|
|
Set<Long> memberIdList = sourceClueClient.findMemberIdList(organizeQueryCriteria).getBody();
|
|
|
|
List<Map<String, Object>> list = findUser((List<Long>) memberIdList, null);
|
|
|
|
List<Long> memberIds = new ArrayList<>(memberIdList);
|
|
|
|
|
|
|
|
List<Map<String, Object>> list = findUser(memberIds, null);
|
|
|
|
updateTaskOrganize.setUserList(list);
|
|
|
|
updateTaskOrganize.setUserList(list);
|
|
|
|
return updateTaskOrganize;
|
|
|
|
return updateTaskOrganize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|