|
@@ -156,7 +156,7 @@ public class UserAllocationController {
|
|
|
|
|
|
|
|
|
@GetMapping(value = "/getAccountListByUserIdAndProductId")
|
|
|
- public Result<List<ProjectMember>> getAccountListByUserIdAndProductId(String userId, Long productId, Integer mediaId) {
|
|
|
+ public Result<List<ProjectMember>> getAccountListByUserIdAndProductId(String userId, Long productId, Integer mediaId,String authName) {
|
|
|
Result<List<ProjectMember>> result = new Result<>();
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
if ("admin".equals(roleCode)) {
|
|
@@ -167,16 +167,13 @@ public class UserAllocationController {
|
|
|
}
|
|
|
List<Integer> mediaList = new ArrayList<>();
|
|
|
mediaList.add(mediaId);
|
|
|
- // List<ProjectMember> projectList = projectMemberService.getOwnProjects(mediaList);
|
|
|
List<ProjectMember> productList = projectMemberService.getOwnProducts(mediaList, productId);
|
|
|
-
|
|
|
- // projectMemberService.getOwnProjects(mediaList);
|
|
|
List<ProjectMember> projectMemberList = new ArrayList<>();
|
|
|
for (ProjectMember projectMember : productList) {
|
|
|
if (!projectMember.getProductId().equals(productId)) {
|
|
|
continue;
|
|
|
}
|
|
|
- List<UserAllocation> userAllocationList = userAllocationService.getAccountListByUserIdAndProductId(userId, projectMember.getProjectId(), productId);
|
|
|
+ List<UserAllocation> userAllocationList = userAllocationService.getAccountListByUserIdAndProductId(userId, projectMember.getProjectId(), productId,authName);
|
|
|
projectMember.setUserAllocationList(userAllocationList);
|
|
|
projectMemberList.add(projectMember);
|
|
|
}
|
|
@@ -186,7 +183,7 @@ public class UserAllocationController {
|
|
|
}
|
|
|
|
|
|
@GetMapping(value = "/getBytedanceAccountListByUserIdAndProductId")
|
|
|
- public Result<List<ProjectMember>> getBytedanceAccountListByUserIdAndProductId(String userId, Long productId, Integer mediaId) {
|
|
|
+ public Result<List<ProjectMember>> getBytedanceAccountListByUserIdAndProductId(String userId, Long productId, Integer mediaId,String autnName) {
|
|
|
Result<List<ProjectMember>> result = new Result<>();
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
if ("admin".equals(roleCode)) {
|
|
@@ -201,7 +198,7 @@ public class UserAllocationController {
|
|
|
if (!projectMember.getProductId().equals(productId)) {
|
|
|
continue;
|
|
|
}
|
|
|
- List<UserAllocation> userAllocationList = userAllocationService.getAccountListByUserIdAndProductId(userId, projectMember.getProjectId(), productId);
|
|
|
+ List<UserAllocation> userAllocationList = userAllocationService.getAccountListByUserIdAndProductId(userId, projectMember.getProjectId(), productId,autnName);
|
|
|
projectMember.setUserAllocationList(userAllocationList);
|
|
|
projectMemberList.add(projectMember);
|
|
|
}
|