diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
index e234b39bc..28ff98ff1 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
@@ -67,6 +67,9 @@ public class EmisWaybillTransferController extends EmisBaseController
public TableDataInfo list(EmisWaybillTransfer emisWaybillTransfer)
{
startPage();
+
+ setPrivParams(emisWaybillTransfer);
+
if(!StringUtils.isEmpty(emisWaybillTransfer.getBillCode())){
emisWaybillTransfer.setBillCode(WaybillHelper.formatQueryValue(emisWaybillTransfer.getBillCode()));
String[] billCodeSortList = emisWaybillTransfer.getBillCode().split(",");
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 6dd66a101..7bf787f74 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
@@ -208,6 +208,7 @@ public class WaybillHelper {
public static String formatQueryValue(String str) {
if(!StringUtils.isEmpty(str)){
str=str.replaceAll("\\n", ",");
+ str=str.replaceAll(",+", ",");
str=StringUtils.removeEnd(str, ",");
}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index 8c8c67cd9..aaf2a00db 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and transfer_bill_code like concat('%', #{transferBillCode}, '%')
and transfer_date = #{transferDate}
- and transfer_express like concat('%', #{transferExpress}, '%')
+ and transfer_express=#{transferExpress}
and link_man like concat('%', #{linkMan}, '%')
and link_phone like concat('%', #{linkPhone}, '%')
and transfer_fee = #{transferFee}
@@ -58,8 +58,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_by like concat('%', #{updateBy}, '%')
and update_time = #{updateTime}
and remark like concat('%', #{remark}, '%')
- and create_site like concat('%', #{createSite}, '%')
- and update_site like concat('%', #{updateSite}, '%')
+ and create_site=#{createSite}
+ and update_site=#{updateSite}
+
+
+ and transfer_date = ]]> #{params.beginTransferDate}
+
+
+ and transfer_date #{params.endTransferDate}
+
+
+
+ and (
+ create_site in (
+ SELECT t1.site_code FROM (
+ SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+ #{params.privSiteCode} ) pd
+ WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+ UNION
+ SELECT #{params.privSiteCode} FROM dual
+ )
+ )
+
order by create_time desc