From 58732ba7ab803e9281c6d00a38c485e61dc48e61 Mon Sep 17 00:00:00 2001 From: yqy Date: Tue, 18 Jan 2022 11:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/OrganizeServiceImpl.java | 6 ++++-- .../java/com/baiye/module/service/impl/ClueServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java index 3a8f2a8c..9eed0fcd 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java @@ -148,7 +148,8 @@ public class OrganizeServiceImpl implements OrganizeService { // 重新分配资源 ClueQueryCriteria clueQueryCriteria = new ClueQueryCriteria(); clueQueryCriteria.setMemberId(userId); - clueQueryCriteria.setUserIds((Set) organizeMemberId); + Set organizeMemberIdSet = new HashSet<>(organizeMemberId); + clueQueryCriteria.setUserIds(organizeMemberIdSet); sourceClueClient.queryOrganizeIdList(clueQueryCriteria); } } @@ -315,7 +316,8 @@ public class OrganizeServiceImpl implements OrganizeService { public TaskOrganize queryDetails(OrganizeQueryCriteria organizeQueryCriteria) { TaskOrganize updateTaskOrganize = taskOrganizeRepository.findByOrganizeIdAndTaskId(organizeQueryCriteria.getOrganizeId(), organizeQueryCriteria.getTaskId()); Set memberIdList = sourceClueClient.findMemberIdList(organizeQueryCriteria).getBody(); - List> list = findUser((List) memberIdList, null); + List memberIds = new ArrayList<>(memberIdList); + List> list = findUser(memberIds, null); updateTaskOrganize.setUserList(list); return updateTaskOrganize; } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 410ef98d..2a90a117 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -108,7 +108,8 @@ public class ClueServiceImpl implements ClueService { clueMiddleList.stream().forEach(ct -> clueIds.add(ct.getClueId())); //小组内资源分配 //Map>:用户id -> 资源ID集合 - List>> maps = AverageDataUtil.averageData(clueIds, (List) clueQueryCriteria.getUserIds()); + List userIdList = new ArrayList<>(clueQueryCriteria.getUserIds()); + List>> maps = AverageDataUtil.averageData(clueIds, userIdList); //批量更新组员信息 for (Map> map : maps) { for (Long userId : map.keySet()) {