Explorar o código

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

anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
b8301f3813

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

@@ -1804,7 +1804,7 @@
     <if test="shiroType ==2">
       left join department d on b.order_dep =d.id
     </if>
-    where  b.delete_sign in (0,2) and b.approval in (0,1,2)
+    where  b.delete_sign in (0,2)
     and a.process_status in (1,2,3,4)
     <if test="shiroType ==1">
         and b.salesman_id = #{aid}
@@ -1872,7 +1872,7 @@
       <if test="shiroType ==2">
         left join department d on b.order_dep =d.id
       </if>
-      where  b.delete_sign in (0,2) and b.approval in (0,1,2)
+      where  b.delete_sign in (0,2)
       and a.process_status in (1,2,3,4)
       <if test="shiroType ==1">
         and b.salesman_id = #{aid}