Forráskód Böngészése

添加订单做转发后看不到数据

hxl13994548489 2 éve
szülő
commit
ce6e824de9

+ 1 - 1
src/main/resources/mapper/modules/admin/SysUserLinkPtlAgreementMapper.xml

@@ -67,7 +67,7 @@
                 and  link.user_id =  #{userId}
             </if>
         </where>
-        order by link.agreement_code
+        order by agree.agreement_code
     </select>
 
     <select id="findAllPtlAgreementListByUserId"  resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">

+ 45 - 26
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -811,7 +811,28 @@
         left JOIN
              ins_orders io  on iac.orderno = io.orderno
         <where>
-             ( (iac.new_operator_id is null or iac.new_operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
+            <if test="agentUserIds != null and agentUserIds.size>0" >
+                AND (
+                (io.userid in
+                <foreach collection="agentUserIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                AND ( iac.new_operator_id IS NULL OR iac.new_operator_id = '' ) )
+                OR iac.new_operator_id = #{orderQueryVo.userId}
+                OR iac.operator_id = #{orderQueryVo.userId}
+                )
+            </if>
+            <if test="agreeIds != null and agreeIds.size>0">
+                AND (
+                (iac.agreement_id in
+                <foreach collection="agreeIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                AND ( iac.new_operator_id IS NULL OR iac.new_operator_id = '' ) )
+                OR iac.new_operator_id = #{orderQueryVo.userId}
+                OR iac.operator_id = #{orderQueryVo.userId}
+                )
+            </if>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
@@ -836,18 +857,7 @@
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
-            <if test="agentUserIds != null and agentUserIds.size>0" >
-                and io.userid in
-                <foreach collection="agentUserIds" item="item"  open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="agreeIds != null and agreeIds.size>0" >
-                and iac.agreement_id in
-                <foreach collection="agreeIds" item="item"  open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+
         </where>
         order by io.createtime desc
     </select>
@@ -863,7 +873,28 @@
             left JOIN
         ins_orders io  on iac.orderno = io.orderno
         <where>
-            ( (iac.new_operator_id is null or iac.new_operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
+            <if test="agentUserIds != null and agentUserIds.size>0" >
+                AND (
+                (io.userid in
+                <foreach collection="agentUserIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                AND ( iac.new_operator_id IS NULL OR iac.new_operator_id = '' ) )
+                OR iac.new_operator_id = #{orderQueryVo.userId}
+                OR iac.operator_id = #{orderQueryVo.userId}
+                )
+            </if>
+            <if test="agreeIds != null and agreeIds.size>0">
+                AND (
+                (iac.agreement_id in
+                <foreach collection="agreeIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                AND ( iac.new_operator_id IS NULL OR iac.new_operator_id = '' ) )
+                OR iac.new_operator_id = #{orderQueryVo.userId}
+                OR iac.operator_id = #{orderQueryVo.userId}
+                )
+            </if>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
@@ -888,18 +919,6 @@
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
-            <if test="agentUserIds != null and agentUserIds.size>0" >
-                and io.userid in
-                <foreach collection="agentUserIds" item="item"  open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="agreeIds != null and agreeIds.size>0" >
-                and iac.agreement_id in
-                <foreach collection="agreeIds" item="item"  open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
         </where>
         ) as s
     </select>