|
@@ -134,35 +134,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
|
|
mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
|
|
mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INSIDE_INT);
|
|
mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INSIDE_INT);
|
|
}
|
|
}
|
|
-
|
|
|
|
//查询登录账号下的项目
|
|
//查询登录账号下的项目
|
|
List<ProjectMember> projectMemberList = this.queryProjectMemberBy(userId, mediaList);
|
|
List<ProjectMember> projectMemberList = this.queryProjectMemberBy(userId, mediaList);
|
|
if (projectMemberList.isEmpty()) {
|
|
if (projectMemberList.isEmpty()) {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
-
|
|
|
|
- // Map<Long, List<JSONObject>> accountMap = userAllocationService.getAccountListByProjectMemberList(projectMemberList);
|
|
|
|
Map<Long, List<JSONObject>> accountMap = this.getAccountListByProjectMemberList(projectMemberList);
|
|
Map<Long, List<JSONObject>> accountMap = this.getAccountListByProjectMemberList(projectMemberList);
|
|
-
|
|
|
|
-
|
|
|
|
- /* temp.put("project", projectMember);
|
|
|
|
- QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
|
|
|
|
- queryWrapper.eq("project_id", projectMember.getProjectId());
|
|
|
|
- queryWrapper.isNotNull("account_id");
|
|
|
|
- List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
|
|
|
|
- if (userAllocations.isEmpty()) {
|
|
|
|
- temp = null;
|
|
|
|
- } else {
|
|
|
|
- temp.put("account", userAllocations);*/
|
|
|
|
-
|
|
|
|
-/*
|
|
|
|
- projectMemberList.forEach(ProjectMember -> {
|
|
|
|
- Map<String, Object> temp = this.queryAccountByProjectId(ProjectMember);
|
|
|
|
- if (temp != null) {
|
|
|
|
- result.add(temp);
|
|
|
|
- }
|
|
|
|
- });*/
|
|
|
|
-
|
|
|
|
for (ProjectMember member : projectMemberList) {
|
|
for (ProjectMember member : projectMemberList) {
|
|
Map<String, Object> temp = new HashMap<>();
|
|
Map<String, Object> temp = new HashMap<>();
|
|
temp.put("project", member);
|
|
temp.put("project", member);
|