zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目管理功能bug修复

Browse Source
This commit is contained in:
冯辉
2026-07-07 15:41:00 +08:00
parent b8ac3e8610
commit 3a62826ed2
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/ProjectController.java
View File

@@ -1,14 +1,18 @@
package com.ruoyi.cms.controller.cms;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import com.ruoyi.cms.domain.Project;
import com.ruoyi.cms.domain.ProjectComment;
import com.ruoyi.cms.service.ICompanyService;
import com.ruoyi.cms.service.IProjectCommentService;
import com.ruoyi.cms.service.IProjectService;
import com.ruoyi.cms.util.RoleUtils;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -44,6 +48,9 @@ public class ProjectController extends BaseController
@Autowired
private IProjectCommentService projectCommentService;
@Autowired
private ICompanyService companyService;
/**
* 获取项目的评论列表
*/
@@ -83,6 +90,13 @@ public class ProjectController extends BaseController
@GetMapping("/list")
public TableDataInfo list(Project query)
{
if (RoleUtils.isCompanyAdmin()) {
Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard());
if (company == null) {
return getDataTable(new ArrayList<>());
}
query.setCompanyId(company.getCompanyId());
}
startPage();
List<Project> list = projectService.selectProjectList(query);
return getDataTable(list);
@@ -108,6 +122,12 @@ public class ProjectController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody Project project)
{
if (RoleUtils.isCompanyAdmin()) {
Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard());
if (company != null) {
project.setCompanyId(company.getCompanyId());
}
}
return toAjax(projectService.save(project));
}

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Project.java
View File

@@ -66,4 +66,7 @@ public class Project extends BaseEntity
@ApiModelProperty("状态 0草稿 1发布")
private String status;
@ApiModelProperty("归属企业ID")
private Long companyId;
}

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ProjectServiceImpl.java
View File

@@ -30,6 +30,7 @@ public class ProjectServiceImpl
wrapper.eq(StringUtils.isNotBlank(query.getRegion()), Project::getRegion, query.getRegion());
wrapper.eq(StringUtils.isNotBlank(query.getCooperationMode()), Project::getCooperationMode, query.getCooperationMode());
wrapper.eq(StringUtils.isNotBlank(query.getStatus()), Project::getStatus, query.getStatus());
wrapper.eq(query.getCompanyId() != null, Project::getCompanyId, query.getCompanyId());
wrapper.orderByDesc(Project::getCreateTime);
return list(wrapper);
}