师傅接单列表查询逻辑修改

common/src/main/resources/mapper/base/WorkOrder.xml

@@ -267,17 +267,18 @@
 		<where>
 			a.del_flag = false
 			<if test="searchParams.status != null">
-				<if test="searchParams.status == 1">
-					and ((a.technician_id = #{searchParams.technicianId} and b.order_model = '1')
-					or b.order_model = '2')
-				</if>
-				<if test="searchParams.status != 1">
-					and a.status_ = #{searchParams.status}
-					<if test="searchParams.technicianId != null">
-						and a.technician_id = #{searchParams.technicianId}
-					</if>
-				</if>
-			</if>
+                <if test="searchParams.technicianId == null">
+                    and b.order_model = '2'
+                </if>
+                <if test="searchParams.technicianId != null">
+                    and a.technician_id = #{searchParams.technicianId}
+                </if>
+			</if>
+            <if test="searchParams.status == null">
+                <if test="searchParams.technicianId != null">
+                    and a.technician_id = #{searchParams.technicianId}
+                </if>
+            </if>
 			<if test="searchParams.key != null">
 				and (a.title_ like #{searchParams.key} or a.address_ like #{searchParams.key})
 			</if>
@@ -285,7 +286,7 @@
 				and a.create_time = #{searchParams.date}
 			</if>
             <if test="searchParams.isAppoint == false">
-                and technician_id is null
+                and a.technician_id is null
             </if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">