From c3961406ac45f9de64ab209398cccebfa7f8b3c7 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 22 Jan 2026 13:28:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxhq/business/controller/PublicController.java | 2 +- .../src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index 95597ca..b216127 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java @@ -194,7 +194,7 @@ public class PublicController extends BaseController { public TableDataInfo list(SjSearchListForm form) { startPage(); - List list = sjService.queryList(form); + List list = sjService.queryPublicList(form); return getDataTable(list); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 2fe87b2..7091456 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -586,6 +586,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } if (form.getZjzt() != null && form.getZjzt().intValue() > 0) { queryWrapper.eq("t.zjzt", form.getZjzt()); + } else { + queryWrapper.isNotNull("t.zjzt"); } if(StringUtils.isNotEmpty(form.getLy())) { queryWrapper.like("t.ly", form.getLy());