Explorar o código

Merge remote-tracking branch 'origin/V1.1.7' into V1.1.7

zhaoxian %!s(int64=4) %!d(string=hai) anos
pai
achega
6f3f245e7a

+ 9 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -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);