Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gj_erp

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);

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->{