diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index c524a40a..be8fc51a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -61,8 +61,6 @@ public class MarketStandardController { * 查看 * * @param marketStandardDetail - * @param pageNo - * @param pageSize * @return */ @AutoLog(value = "外部标准库-市场法规清单-查看") @@ -70,10 +68,8 @@ public class MarketStandardController { @GetMapping(value = "/detail") @ApiOperationSupport(order = 2) @RequiresPermissions("marketStandard:detail") - public Result detail(LawsMarketStandardDetail marketStandardDetail, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail, pageNo, pageSize); + public Result detail(LawsMarketStandardDetail marketStandardDetail) { + MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail); return Result.OK(result); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java index d678e857..dde3a646 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java @@ -16,9 +16,6 @@ public class MarketStandardDetailVO { @ApiModelProperty(value = "新增编辑数据") private List lists; - @ApiModelProperty(value = "查看分页数据") - private IPage pageData; - @ApiModelProperty(value = "历史版本") private List historyVersions; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index b5fc78d7..00e213f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -37,11 +37,9 @@ public interface ILawsMarketStandardService extends IService /** * 查看 * @param marketStandardDetail - * @param pageNo - * @param pageSize * @return */ - MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail, Integer pageNo, Integer pageSize); + MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail); /** * 分页查询 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 3fe8a72c..0d4fac57 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -101,7 +101,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); // 列表数据 - Page page = new Page<>(pageNo, pageSize); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()), LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber()); wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()), LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName()); wrapper.in(LawsMarketStandardDetail::getManifestId, idList); - Page pageData = lawsMarketStandardDetailService.page(page, wrapper); - result.setPageData(pageData); + List pageData = lawsMarketStandardDetailService.list(wrapper); + result.setLists(pageData); // 如果不是合并查看列表页面 if (idList.size() > 1) {