fix:优化执行顺序

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/TJsVo.java

@@ -21,6 +21,9 @@ public class TJsVo extends TJs {
     @ApiModelProperty("项目编号")
     private String projectId;
 
+    @ApiModelProperty("免车费")
+    private String free;
+
     private List<String> ids;
 
 }

nightFragrance-massage/src/main/resources/mapper/massage/TJsMapper.xml

@@ -55,6 +55,8 @@
         js.c_name,
         js.c_phone,
         js.c_address,
+        js.nigth_mileage,
+        js.daytime_mileage,
         js.health_certificate,
         js.business_license,
         js.c_jianjie,
@@ -100,7 +102,7 @@
             <if test="param.nSex != null">
                 and js.n_sex = #{param.nSex}
             </if>
-            <if test="param.city != null">
+            <if test="param.city != null and param.city != ''">
                 and js.city = #{param.city}
             </if>
             <if test="param.jsGrade != null">
@@ -125,6 +127,9 @@
             <if test="param.projectId != null and param.projectId != ''">
                 AND FIND_IN_SET(#{param.projectId}, js.c_bh_list )
             </if>
+            <if test="param.free != null and param.free == 1">
+                AND (daytime_mileage > 0 OR nigth_mileage > 0)
+            </if>
             <if test="param.ids != null and param.ids.size() > 0">
                 and js.c_open_id in
                 <foreach item="id" collection="param.ids" open="(" separator="," close=")">