test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(工作台): 非工作台分页查询数据有误

This commit is contained in:
song-cc-rock 2024-12-04 10:33:45 +08:00 committed by Craftsman
parent 684af9a6d0
commit aeede658ab
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java
View File

@ -2123,6 +2123,10 @@ public class BugService {
* @return 待办参数 * @return 待办参数
*/ */
public BugTodoRequest buildBugToDoParam(BugPageRequest request, String currentUserId, String currentOrgId) { public BugTodoRequest buildBugToDoParam(BugPageRequest request, String currentUserId, String currentOrgId) {
if (!request.getRelatedToPlan() && !request.getCreateByMe() && request.getAssignedToMe()) {
// 非工作台跳转, 不过滤
return null;
}
List<String> msLastStepStatusIds = bugCommonService.getLocalLastStepStatus(request.getProjectId()); List<String> msLastStepStatusIds = bugCommonService.getLocalLastStepStatus(request.getProjectId());
BugTodoRequest todoParam = BugTodoRequest.builder().build(); BugTodoRequest todoParam = BugTodoRequest.builder().build();
if (request.getAssignedToMe() || request.getCreateByMe()) { if (request.getAssignedToMe() || request.getCreateByMe()) {

6
backend/services/dashboard/src/main/java/io/metersphere/dashboard/controller/ToDoController.java
View File

@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import io.metersphere.bug.dto.request.BugPageRequest; import io.metersphere.bug.dto.request.BugPageRequest;
import io.metersphere.bug.dto.response.BugDTO; import io.metersphere.bug.dto.response.BugDTO;
import io.metersphere.bug.service.BugCommonService;
import io.metersphere.bug.service.BugService; import io.metersphere.bug.service.BugService;
import io.metersphere.functional.dto.CaseReviewDTO; import io.metersphere.functional.dto.CaseReviewDTO;
import io.metersphere.functional.request.CaseReviewPageRequest; import io.metersphere.functional.request.CaseReviewPageRequest;
@ -14,7 +13,6 @@ import io.metersphere.plan.dto.response.TestPlanResponse;
import io.metersphere.plan.dto.response.TestPlanStatisticsResponse; import io.metersphere.plan.dto.response.TestPlanStatisticsResponse;
import io.metersphere.plan.service.TestPlanManagementService; import io.metersphere.plan.service.TestPlanManagementService;
import io.metersphere.plan.service.TestPlanStatisticsService; import io.metersphere.plan.service.TestPlanStatisticsService;
import io.metersphere.project.service.ProjectApplicationService;
import io.metersphere.system.security.CheckOwner; import io.metersphere.system.security.CheckOwner;
import io.metersphere.system.utils.PageUtils; import io.metersphere.system.utils.PageUtils;
import io.metersphere.system.utils.Pager; import io.metersphere.system.utils.Pager;
@ -47,14 +45,10 @@ public class ToDoController {
@Resource @Resource
private BugService bugService; private BugService bugService;
@Resource @Resource
private BugCommonService bugCommonService;
@Resource
private CaseReviewService caseReviewService; private CaseReviewService caseReviewService;
@Resource @Resource
private TestPlanManagementService testPlanManagementService; private TestPlanManagementService testPlanManagementService;
@Resource @Resource
private ProjectApplicationService projectApplicationService;
@Resource
private TestPlanStatisticsService testPlanStatisticsService; private TestPlanStatisticsService testPlanStatisticsService;
@PostMapping("/plan/page") @PostMapping("/plan/page")