Browse Source

Merge remote-tracking branch 'origin/master'

zhouzeyu@c-top.com.cn 3 years ago
parent
commit
2e5d1e0548

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

@@ -512,10 +512,10 @@ public class ProjectMemberController {
      * @return
      */
     @GetMapping("/getProjectAccountByUserId")
-    public Result<List<Map<String, Object>>> getProjectAccountBy(String mediaType) {
+    public Result<List<Map<String, Object>>> getProjectAccountBy(String mediaType,String userId) {
         Result<List<Map<String, Object>>> resultBody = new Result<>();
         try {
-            String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+
             List<Map<String, Object>> result = projectMemberService.getProjectAccountByUserId(userId, mediaType);
             resultBody.setSuccess(true);
             resultBody.setResult(result);

+ 0 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -139,35 +139,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
             mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INT);
             mediaList.add(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_INSIDE_INT);
         }
-
         //查询登录账号下的项目
         List<ProjectMember> projectMemberList = this.queryProjectMemberBy(userId, mediaList);
         if (projectMemberList.isEmpty()) {
             return result;
         }
-
-        // Map<Long, List<JSONObject>> accountMap = userAllocationService.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) {
             Map<String, Object> temp = new HashMap<>();
             temp.put("project", member);