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<SjListDto> list = sjService.queryList(form);
+        List<SjListDto> 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<SjMapper, Sj> 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());