From 5aa0c96c5bee86ca8d121b90a0a31ae7416d3df9 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期五, 29 十二月 2023 10:55:18 +0800
Subject: [PATCH] bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
index e9eabf9..3b18e5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -88,9 +88,10 @@
         QueryWrapper<ComPbCheckUnit> wrapper = new QueryWrapper<>();
         if(treeListVO.getName() != null){
             wrapper.eq("belong_to",treeListVO.getName());
-        }
-        if(treeListVO.getOrgName() != null){
+        } else if(treeListVO.getOrgName() != null){
             wrapper.eq("org_name",treeListVO.getOrgName());
+        } else {
+            return R.ok();
         }
         List<ComPbCheckUnit> comPbCheckUnits = this.baseMapper.selectList(wrapper);
         return R.ok(comPbCheckUnits);

--
Gitblit v1.7.1