diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentDefinitionClient.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentDefinitionClient.java index f277c0f..7e85d73 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentDefinitionClient.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentDefinitionClient.java @@ -49,8 +49,8 @@ public interface IContentDefinitionClient { * @param request 筛选条件 * @return */ - @GetMapping(LIST) - R> list(@RequestParam ("request") ContentDefinitionDTO request); + @PostMapping(LIST) + R> list(@RequestBody ContentDefinitionDTO request); /** * 批量更新 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java index f7a0922..97d5b5c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ContentDefinitionClient.java @@ -47,8 +47,8 @@ public class ContentDefinitionClient implements IContentDefinitionClient { } @Override - @GetMapping(LIST) - public R> list(@RequestParam("request") ContentDefinitionDTO request) { + @PostMapping(LIST) + public R> list(@RequestBody ContentDefinitionDTO request) { return R.data(contentDefinitionService.list(request)); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java index 94fb2de..ae898f5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ProjectServiceImpl.java @@ -110,6 +110,7 @@ public class ProjectServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery() .eq(ProjectEntity::getEmCode, emCode) .eq(ProjectEntity::getStatus, ObjectConstants.ProjectEnableEnum.YES.getEnableType()); @@ -127,8 +128,13 @@ public class ProjectServiceImpl extends ServiceImpl contentIdList = projectContentList.stream().map(ProjectContentEntity::getContentId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = Condition.getQueryWrapper(BeanUtil.copy(content,ContentEntity.class)).lambda(); wrapper.in(CollectionUtil.isNotEmpty(contentIdList),ContentEntity::getId, contentIdList); - IPage page = contentService.page(Condition.getPage(query), wrapper); - projectVO.setContentList(ContentWrapper.build().listVO(page.getRecords())); + if(-1 == query.getSize()) { + List contents = contentService.list(wrapper); + projectVO.setContentList(ContentWrapper.build().listVO(contents)); + } else { + IPage page = contentService.page(Condition.getPage(query), wrapper); + projectVO.setContentList(ContentWrapper.build().listVO(page.getRecords())); + } } return projectVO; }