Merge branch 'develop'

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -78,23 +78,31 @@
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
         ri.publish =1
-        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()"/>
-        <if test="isPilotUserIdListEmpty">
-        and
+        <choose>
+            <when test="pilotUserIdList != null and !pilotUserIdList.isEmpty()">
+                <!-- 当 pilotUserIdList 不为空时 说明不是后台用户不是admin 是其他后台用户啊查看飞手接单或者货单就只能看到自己团队飞手的接单发单-->
+                and (
                 <choose>
                     <when test="isPilotOrder == 0">
+--                     当时发单的时候要是看到的是总订单
                         ri.father_require_id = 0
-                    and
-                    ri.user_account_id IN
+                        and ri.user_account_id IN
                     </when>
                     <when test="isPilotOrder == 1">
+--                     接单接的是子订单就只能看到子订单
                         rs.pilot_certification_user_id IN
                     </when>
                 </choose>
                 <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-        </if>
+                )
+            </when>
+            <otherwise>
+                <!-- 剩下就是admin用户就是要查出所用接单发单就行 只要主订单-->
+                and ri.father_require_id = 0
+            </otherwise>
+        </choose>
           <if test="orderStatus != null and orderStatus!='' ">
             and sf.order_status = #{orderStatus}
         </if>