diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
index 6a7378c..53e38c1 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
@@ -415,10 +415,6 @@ public class McVisitController extends BaseController {
             }else  if (datum.getChargeType().equals("4")){
                 chargeType="分期";
             }
-
-
-
-
             ChargedListDto chargedListDto = new ChargedListDto(
                     datum.getEntryTime(),
                     datum.getBillingPersonName(),
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
index 4e2ce60..7652860 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -679,12 +679,12 @@
                 t.ticket_type = #{item}
             </foreach>
         </if>
-        <if test="startEntryTime != null "> and t.entry_time &gt;= #{startEntryTime} </if>
-        <if test="finishEntryTime != null "> and t.entry_time &lt;= #{finishEntryTime} </if>
+        <if test="startEntryTime != null and startEntryTime != '' "> and t.entry_time &gt;= #{startEntryTime} </if>
+        <if test="finishEntryTime != null  and finishEntryTime != '' "> and t.entry_time &lt;= #{finishEntryTime} </if>
         <if test="ignCnfStatusCode != null  and ignCnfStatusCode != ''"> and i.ign_cnf_status_code = #{ignCnfStatusCode}</if>
         <if test="idList != null  and idList.size() > 0">
-            t.id in
-            <foreach collection="idList" item="item" index="index" separator=","  open=" and (" close=")">
+           and t.id in
+            <foreach collection="idList" item="item" index="index" separator=","  open=" (" close=")">
                 #{item}
             </foreach>
         </if>
@@ -714,6 +714,6 @@
         </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by t.update_time desc
+        order by update_time desc
     </select>
 </mapper>
--
libgit2 0.21.2