diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 9bcbc857c..1e0050507 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1277,6 +1277,16 @@ public class EmisBaseService { String pdfInfo="["+package3dm+"]["+packageWJC+"]"; order.put("pdfInfo", pdfInfo); + // String pdfInfo = waybill.getThirdCode(); +// if(!StringUtils.isEmpty(pdfInfo)) { +// pdfInfo = pdfInfo.replace("][", "||"); +// String[] striparr = pdfInfo.split("\\|\\|"); +// if(striparr.length == 2) { +// packageWJC = striparr[1].replace("]", ""); +// package3dm = striparr[0].replace("[", ""); +// } +// } + order.put("packageWJC", packageWJC); order.put("package3dm", package3dm); diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 65b25b692..c3547c9c3 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -123,7 +123,7 @@ and nick_name like concat('%', #{nickName}, '%') and union_id like concat('%', #{unionId}, '%') and openid like concat('%', #{openid}, '%') - and monthly_pay_code like concat('%', #{monthlyPayCode}, '%') + and monthly_pay_code= #{monthlyPayCode} and user_name like concat('%', #{userName}, '%') and biz_site_name like concat('%', #{bizSiteName}, '%')