|
@@ -25,7 +25,6 @@ import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
|
import org.jeecg.modules.ctop.service.IProjectService;
|
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
|
-import org.jeecg.modules.system.entity.UserCompany;
|
|
|
import org.jeecg.modules.system.mapper.UserCompanyMapper;
|
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
@@ -74,37 +73,21 @@ public class ProjectController {
|
|
|
private UserCompanyMapper userCompanyMapper;
|
|
|
|
|
|
/**
|
|
|
- * 公司下所有项目
|
|
|
+ * 根据 项目 媒体类型 查看项目
|
|
|
*
|
|
|
- * @param userId
|
|
|
+ * @param advertiserId
|
|
|
+ * @param mediaId
|
|
|
* @return
|
|
|
*/
|
|
|
|
|
|
- @GetMapping(value = "/getProjectByCompany")
|
|
|
- public Result<List<Project>> getProjectByCompany(String userId, String mediaId) {
|
|
|
+ @GetMapping(value = "/getProjectByAdvertiserAndMediaId")
|
|
|
+ public Result<List<Project>> getProjectByCompany(String advertiserId, String mediaId) {
|
|
|
Result<List<Project>> result = new Result<>();
|
|
|
try {
|
|
|
QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
|
- List<Project> projects = new ArrayList<>();
|
|
|
- String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
- if (!"admin".equals(roleCode)) {
|
|
|
- QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
- userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
- userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
- userCompanyQueryWrapper.last("limit 1");
|
|
|
- UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
- if (Check.isNull(userCompany)) {
|
|
|
- throw new Exception("公司信息为空");
|
|
|
- }
|
|
|
-
|
|
|
- queryWrapper.eq("media_id", mediaId);
|
|
|
- queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
- projects = projectMapper.selectList(queryWrapper);
|
|
|
- } else {
|
|
|
- queryWrapper.eq("media_id", mediaId);
|
|
|
- projects = projectMapper.selectList(queryWrapper);
|
|
|
-
|
|
|
- }
|
|
|
+ queryWrapper.eq("media_id", mediaId);
|
|
|
+ queryWrapper.eq("advertiser_id", advertiserId);
|
|
|
+ List<Project> projects = projectMapper.selectList(queryWrapper);
|
|
|
result.setSuccess(true);
|
|
|
result.setResult(projects);
|
|
|
} catch (Exception e) {
|