From 4d5bc4cf7f2670e057b024eb9802f41684ff1a38 Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Tue, 28 Nov 2023 13:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/controller/jcsj/DmBomController.java     | 2 +-
 .../dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
index 7eee0a5..0898456 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
@@ -67,7 +67,7 @@ public class DmBomController {
             .eq(StrUtil.isNotEmpty((String) map.get("fd")), "fd", map.get("dcfd"))
             .eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "pl", map.get("dcpl"))
             .eq(StrUtil.isNotEmpty((String) map.get("zt")), "zt", map.get("zt"))
-                .notIn("idd",idds)
+                .notIn(idds.size()>0,"idd",idds)
             .orderBy(true,true,"pl","fd","type","tzbh","ljbh")
         );
         return  new ResultBean(list);
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java
index 93545b5..825c375 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java
@@ -31,7 +31,10 @@ public class DmCbxxpServiceImpl extends ServiceImpl<DmCbxxpMapper, DmCbxxp> impl
     public List<DmCbxxp> getList(Map map) {
         QueryWrapper<DmCbxxp> qw= new QueryWrapper<>();
         qw.likeRight(StrUtil.isNotEmpty((String)map.get("cbbm")),"cbbm",(String)map.get("cbbm"));
-        qw.eq(StrUtil.isNotEmpty((String)map.get("wgbs")),"wgbs",(String)map.get("wgbs"));
+        if((Boolean) map.get("flag")){
+            qw.eq("ISNULL(wgbs,'N')","N");
+        }
+
         qw.orderBy(true,true,"cbmc");
         List<DmCbxxp> list = this.list(qw);
         list.forEach(e->{