From a5a1f01335ed738e10f8b6ae35f678e1e36e8e1b Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Tue, 30 Jul 2024 15:30:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84):=20=E4=BA=A7=E5=93=81=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E6=8F=90=E4=BE=9B=E7=9B=B4=E6=8E=A5=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BB=8E=E7=9F=A5=E8=AF=86=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E9=80=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整知识库列表接口逻辑，新增参数（是否不包含wiki），用户传入参数后知识库列表接口将不返回wiki类型的文档 --- .../pms/document/controller/PmsDocumentController.java | 1 - .../pms/document/domain/vo/PmsDocumentSearchVo.java | 3 +++ .../src/main/resources/mapper/pms/PmsDocumentMapper.xml | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentController.java index 9a3343e57..225c79ab5 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentController.java @@ -48,7 +48,6 @@ public class PmsDocumentController extends BaseController }) public GenericsTableDataInfo list( @Validated PmsDocumentSearchVo pmsDocumentSearchVo) { - return pmsDocumentService.selectPmsDocumentVoList(pmsDocumentSearchVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentSearchVo.java index a5078b508..71822bfa2 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentSearchVo.java @@ -44,6 +44,9 @@ public class PmsDocumentSearchVo extends BaseEntity @ApiModelProperty(value = "是否仅筛选我创建的文档 true是 false否") private Boolean isCreatedOnly; + @ApiModelProperty(value = "是否不包含wiki") + private Boolean notIncludeWiki; + /** 是否为企业管理员 */ @JsonIgnore @ApiModelProperty(value = "是否为企业管理员", hidden = true) diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml index c947bd719..8a39b39f2 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml @@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pms_enterprise_id = #{pmsEnterpriseId} + + and doc_type != 4 + ${params.dataScope}