|
@@ -149,6 +149,11 @@ public class ProjectMemberController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取项目以及账户信息
|
|
|
+ * @param requestJson
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@PostMapping(value = "/participateListByMediaId")
|
|
|
public Result<List<JSONObject>> participateListByMediaId(@RequestBody JSONObject requestJson) {
|
|
|
Result<List<JSONObject>> result = new Result<>();
|
|
@@ -168,13 +173,17 @@ public class ProjectMemberController {
|
|
|
mediaIds.add(3);
|
|
|
}
|
|
|
}
|
|
|
+ //查询用户角色
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
+ //角色为 管理员 || 销售 || 媒介 查询全部
|
|
|
if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
|
|
|
userId = null;
|
|
|
}
|
|
|
+ //查询项目信息以及广告主
|
|
|
List<JSONObject> projectList = projectMemberService.getProjectByUserIdAndMediaIds(userId, mediaIds);
|
|
|
List<JSONObject> haveList = new ArrayList<>();
|
|
|
if (!Check.isNull(projectList)) {
|
|
|
+ //项目id 查询账户人员信息
|
|
|
Map<Long, List<JSONObject>> accountMap = userAllocationService.getAccountListByProjectList(projectList);
|
|
|
for (int i = 0; i < projectList.size(); i++) {
|
|
|
JSONObject project = projectList.get(i);
|