|
@ -61,7 +61,7 @@ public class TestReportController { |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
testReport.setCreateBy(LoginHelper.getUserId().toString()); |
|
|
|
|
|
|
|
|
testReport.setCreateBy(LoginHelper.getUsername()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Page result = testReportService.page(page, Wrappers.query(testReport)); |
|
|
Page result = testReportService.page(page, Wrappers.query(testReport)); |
|
@ -106,7 +106,7 @@ public class TestReportController { |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
testReport.setCreateBy(LoginHelper.getUserId().toString()); |
|
|
|
|
|
|
|
|
testReport.setCreateBy(LoginHelper.getUsername()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Page result = testReportSubmitService.page(page, Wrappers.query(testReport)); |
|
|
Page result = testReportSubmitService.page(page, Wrappers.query(testReport)); |
|
|