|
@@ -78,7 +78,9 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
|
|
|
|
|
|
// 维多利亚扩展根据到货仓库id过滤
|
|
|
wrapper.eq("json_unquote(t2.victoriatourist_json -> '$.receiptWarehouseId')", dto.getReceiptWarehouseId());
|
|
|
- wrapper.eq(ObjectUtil.isNotEmpty(dto.getDeptId()),"json_unquote(pi.victoriatourist_json -> '$.deptId')", dto.getDeptId().toString());
|
|
|
+ if(ObjectUtil.isNotEmpty(dto.getDeptId())) {
|
|
|
+ wrapper.eq( "json_unquote(pi.victoriatourist_json -> '$.deptId')", dto.getDeptId().toString());
|
|
|
+ }
|
|
|
//待采购过滤掉指定状态 例如不要 99 作废
|
|
|
if (ObjectUtil.isNotEmpty(dto.getNeStatus())) {
|
|
|
wrapper.notIn("t1", SubscribeDetail::getStatus, dto.getNeStatus().split(","));
|