diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
index 13df48f9c..c32ff390e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
@@ -23,6 +23,7 @@ import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,7 +40,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
@@ -72,6 +72,24 @@ public class EmisWaybillAttachmentController extends EmisBaseController
     public TableDataInfo list(EmisWaybillAttachment emisWaybillAttachment)
     {
         startPage();
+
+        // 设置通用权限查询参数
+        setPrivParams(emisWaybillAttachment);
+
+        if(!org.apache.commons.lang3.StringUtils.isEmpty(emisWaybillAttachment.getBillCode())){
+            if(emisWaybillAttachment.getBillCode().lastIndexOf(",")!=-1) {
+                StringBuilder sb = new StringBuilder(emisWaybillAttachment.getBillCode());
+                sb.deleteCharAt(sb.lastIndexOf(","));
+                emisWaybillAttachment.setBillCode(sb.toString());
+            }
+
+            String[] billCodeSortList = emisWaybillAttachment.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybillAttachment.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
+        }
+
+
         List<EmisWaybillAttachment> list = emisWaybillAttachmentService.selectEmisWaybillAttachmentList(emisWaybillAttachment);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index b1c84aa3a..801b98fb3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -28,8 +28,8 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
-            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
-            <if test="attachType != null  and attachType != ''"> and attach_type like concat('%', #{attachType}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="attachType != null  and attachType != ''"> and attach_type=#{attachType}</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>
             <if test="fileSiez != null "> and file_siez = #{fileSiez}</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index ebad9bd17..bb4553de7 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -48,14 +48,14 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
 
-            <if test="problemType != null  and problemType != ''"> and problem_type like concat('%', #{problemType}, '%')</if>
+            <if test="problemType != null  and problemType != ''"> and FIND_IN_SET(problem_type,#{problemType})</if>
             <if test="problemTitle != null  and problemTitle != ''"> and problem_title like concat('%', #{problemTitle}, '%')</if>
             <if test="problemCause != null  and problemCause != ''"> and problem_cause like concat('%', #{problemCause}, '%')</if>
             <if test="sendSite != null  and sendSite != ''"> and send_site like concat('%', #{sendSite}, '%')</if>
-            <if test="sendSiteCode != null  and sendSiteCode != ''"> and send_site_code like concat('%', #{sendSiteCode}, '%')</if>
-            <if test="registerManCode != null  and registerManCode != ''"> and register_man_code like concat('%', #{registerManCode}, '%')</if>
+            <if test="sendSiteCode != null  and sendSiteCode != ''"> and send_site_code=#{sendSiteCode}</if>
+            <if test="registerManCode != null  and registerManCode != ''"> and register_man_code=#{registerManCode}</if>
             <if test="registerManDept != null  and registerManDept != ''"> and register_man_dept like concat('%', #{registerManDept}, '%')</if>
-            <if test="registerSiteCode != null  and registerSiteCode != ''"> and register_site_code like concat('%', #{registerSiteCode}, '%')</if>
+            <if test="registerSiteCode != null  and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
             <if test="registerDate != null "> and register_date = #{registerDate}</if>
             <if test="registerSaveDate != null  and registerSaveDate != ''"> and register_save_date like concat('%', #{registerSaveDate}, '%')</if>
             <if test="dataFrom != null  and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
@@ -77,6 +77,15 @@
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
+            <if test="params.beginRegisterDate != null and params.beginRegisterDate != ''">
+                and register_date <![CDATA[ >= ]]>  #{params.beginRegisterDate}
+            </if>
+            <if test="params.endRegisterDate != null and params.endRegisterDate != ''">
+                and register_date <![CDATA[ <= ]]>  #{params.endRegisterDate}
+            </if>
+
+
         </where>
         order by create_time desc
     </select>