Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/resources/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.xml

@@ -522,7 +522,7 @@
     ON apo.RECEIVE_UNIT_ID = rsr.SHIPPER_ID
     where
       apo.DELETED = 0
-      <if test="con != null" >
+      <if test="con != null and con !=''.toString()" >
         and instr(apo.PURCHASE_ORDER_NO, #{con}) > 0 or instr(rsu.SUPPLIER_NAME, #{con}) > 0
         or instr(rsb.SHIPPER_NAME, #{con}) > 0  or instr(rm.MATERIAL_NAME, #{con}) > 0
         or instr(db.RESULT_FOREIGN_SHIP_NAME, #{con}) > 0