diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java index 01870a7a4..6c23487ae 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java @@ -241,7 +241,7 @@ public class WaybillHelper { public static String cvtBillToJsonString(Object obj) { return JSON.toJSONString(obj, (ValueFilter) (object, name, value) -> { if(value == null){ - return ""; + return " "; } return value; }, SerializerFeature.WriteMapNullValue); diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index e452df438..17edaafdc 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -106,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.confirm_site_code = #{confirmSiteCode} + + and a.problem_type != + and a.send_site_code = #{params.sendSiteCode}