|
@@ -1,8 +1,10 @@
|
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.Advertiser;
|
|
|
+import cn.com.ctop.common.module.entity.Product;
|
|
|
import cn.com.ctop.common.module.entity.Project;
|
|
|
import cn.com.ctop.common.module.entity.SysUser;
|
|
|
+import cn.com.ctop.common.module.service.IProductService;
|
|
|
import cn.com.ctop.common.module.service.IProjectService;
|
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
@@ -159,6 +161,8 @@ public class ProjectMemberController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IProductService productService;
|
|
|
|
|
|
@GetMapping(value = "/participateListV2")
|
|
|
public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,
|
|
@@ -189,7 +193,6 @@ public class ProjectMemberController {
|
|
|
queryWrapper.orderByDesc("create_time");
|
|
|
|
|
|
|
|
|
-
|
|
|
Page<ProjectMember> page = new Page<>(pageNo, pageSize);
|
|
|
IPage<ProjectMember> pageList = projectMemberService.page(page, queryWrapper);
|
|
|
List<ProjectMember> projectMembers = pageList.getRecords();
|
|
@@ -206,6 +209,12 @@ public class ProjectMemberController {
|
|
|
SysUser designResponsible = sysUserService.getById(project.getDesignResponsibleId());
|
|
|
member.setDesignResponsibleName(designResponsible.getRealname());
|
|
|
Advertiser advertiser = advertiserService.getById(project.getAdvertiserId());
|
|
|
+
|
|
|
+ Product product = productService.getById(project.getProductId());
|
|
|
+ if (!Check.isNull(product)) {
|
|
|
+ member.setProductId(product.getId());
|
|
|
+ member.setProductName(product.getProductName());
|
|
|
+ }
|
|
|
member.setAdvertiserName(advertiser.getName());
|
|
|
member.setAdvertiserId(project.getAdvertiserId());
|
|
|
member.setAdvertiserId(project.getAdvertiserId());
|