|
@@ -117,8 +117,15 @@ public class UserAllocationController {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 统计报表 查看所有账号
|
|
|
|
+ *
|
|
|
|
+ * @param projectId
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@GetMapping(value = "/getAccountListByProjectId")
|
|
@GetMapping(value = "/getAccountListByProjectId")
|
|
- public Result<List<UserAllocation>> getAccountListByProjectId(String userId, Long projectId) {
|
|
|
|
|
|
+ public Result<List<UserAllocation>> getAccountListByProjectId(Long projectId) {
|
|
Result<List<UserAllocation>> result = new Result<>();
|
|
Result<List<UserAllocation>> result = new Result<>();
|
|
try {
|
|
try {
|
|
|
|
|
|
@@ -128,11 +135,6 @@ public class UserAllocationController {
|
|
if (!Check.isNull(project)) {
|
|
if (!Check.isNull(project)) {
|
|
queryWrapper.eq("media_id", project.getMediaId());
|
|
queryWrapper.eq("media_id", project.getMediaId());
|
|
}
|
|
}
|
|
-
|
|
|
|
- String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
|
- /* if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)) {
|
|
|
|
- queryWrapper.eq("user_id", userId);
|
|
|
|
- }*/
|
|
|
|
List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
|
|
List<UserAllocation> userAllocations = userAllocationMapper.selectList(queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(userAllocations);
|
|
result.setResult(userAllocations);
|