Skip to content

Commit ebfbfb9

Browse files
author
王灏
committed
Merge branch 'feature-c7n-502' into 'master'
Feature c7n 502 See merge request hand-yanqianyun-yq-devops/devops-service!1431
2 parents 37d65c4 + 55ab0b2 commit ebfbfb9

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/main/java/io/choerodon/devops/api/controller/v1/DevopsProjectQualityController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.http.ResponseEntity;
77
import org.springframework.web.bind.annotation.*;
8-
import springfox.documentation.annotations.ApiIgnore;
98

109
import io.choerodon.core.domain.Page;
1110
import io.choerodon.core.iam.InitRoleCode;
@@ -43,7 +42,6 @@ public ResponseEntity<Page<SonarAnalyseIssueAuthorVO>> listMemberIssue(
4342
@ApiParam(value = "项目id", required = true)
4443
@PathVariable(value = "project_id") Long projectId,
4544
@RequestParam(value = "app_service_id") Long appServiceId,
46-
@ApiIgnore
4745
PageRequest pageRequest) {
4846
return ResponseEntity.ok(sonarAnalyseRecordService.listMemberIssue(projectId, appServiceId, pageRequest));
4947
}

src/main/java/io/choerodon/devops/app/service/impl/SonarAnalyseRecordServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public SonarOverviewVO querySonarOverview(Long projectId) {
373373

374374
@Override
375375
public Page<SonarAnalyseIssueAuthorVO> listMemberIssue(Long projectId, Long appServiceId, PageRequest pageRequest) {
376-
Page<SonarAnalyseIssueAuthorVO> page = PageHelper.doPage(pageRequest, () -> sonarAnalyseUserIssueAuthorService.listMemberIssue(appServiceId));
376+
Page<SonarAnalyseIssueAuthorVO> page = PageHelper.doPageAndSort(pageRequest, () -> sonarAnalyseUserIssueAuthorService.listMemberIssue(appServiceId));
377377
List<SonarAnalyseIssueAuthorVO> content = page.getContent();
378378
if (CollectionUtils.isEmpty(content)) {
379379
return page;

0 commit comments

Comments
 (0)