Parcourir la source

Merge branch 'test' of jishutao/kede-server into prod

anderx il y a 4 ans
Parent
commit
678ce63c98
1 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 4 2
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 4 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -853,6 +853,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	where a.delete_sign !=1
     <if test="specially ==7">
       and a.process_status > 4
+      and a.salesman_id = #{aid,jdbcType=VARCHAR}
     </if>
   	<if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}
@@ -963,6 +964,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	where a.delete_sign !=1
      <if test="specially ==7">
        and a.process_status > 4
+       and a.salesman_id = #{aid,jdbcType=VARCHAR}
      </if>
     <if test="outsource != null">
   	and a.outsource= #{outsource,jdbcType=INTEGER}
@@ -1434,7 +1436,7 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
                     a.total_amount total
                     from t_order_new a left join admin b on a.salesman_id =b.id
                     left join department c on b.department_id =c.id left join district_glossory d on c.province =d.id
-                   where a.process_status >4
+                   where a.process_status >4 and a.delete_sign in(0,2)
                    <if test="depId !=null">
                     and  b.department_id = #{depId}
                    </if>
@@ -1468,7 +1470,7 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
                     a.total_amount total
                     from t_order_new a left join admin b on a.salesman_id =b.id
                     left join department c on b.department_id =c.id left join district_glossory d on c.province =d.id
-                    where a.process_status >4
+                    where a.process_status >4 and a.delete_sign in(0,2)
                     <if test="depId !=null">
                       and  b.department_id = #{depId}
                     </if>