From 6d17c915006122063cec3ecfae8eaf7b0c2e7f17 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Mon, 9 Mar 2026 09:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8C=85=E8=A3=85=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=20name=E7=AD=89=E4=BA=8E=E7=A9=BA=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/basic/domain/pack/service/PackDomainService.java | 1 + .../basic/domain/packDetail/repository/todo/PackDetailDO.java | 3 +++ .../resources/mapper/basic/packDetail/PackDetailMapper.xml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/service/PackDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/service/PackDomainService.java index 93a0f86ae..59da922fb 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/service/PackDomainService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/service/PackDomainService.java @@ -75,6 +75,7 @@ public class PackDomainService { PackPO packPO = packService.getInfo(packId); PackDetailDO packDetailDO = new PackDetailDO(); packDetailDO.setPackId(packId); + packDetailDO.setIsName("1"); List packDetailPOList = packDetailService.queryList(packDetailDO); packPO.setPackDetailList(packDetailPOList); return packPO; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/packDetail/repository/todo/PackDetailDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/packDetail/repository/todo/PackDetailDO.java index 7e077b93b..0f45f3c19 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/packDetail/repository/todo/PackDetailDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/packDetail/repository/todo/PackDetailDO.java @@ -93,6 +93,9 @@ public class PackDetailDO extends BaseVOEntity{ @Excel(name = "备注") private String remark; + @ApiModelProperty("过滤空name") + private String isName; + @ApiModelProperty(name = "组织ID集合") private List organizationIdList; diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/packDetail/PackDetailMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/packDetail/PackDetailMapper.xml index c58fa7133..8b9a5e76a 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/packDetail/PackDetailMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/packDetail/PackDetailMapper.xml @@ -57,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and name like concat('%', #{name}, '%') + + AND NAME IS NOT NULL AND NAME != '' + and number = #{number}