Browse Source

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

anderx 1 year ago
parent
commit
ea7afdd83d
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

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

@@ -1069,7 +1069,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           (1)
         </if>
         <if test="manageType ==1">
-          (5)
+          (4)
         </if>
       </if>
       <if test="approval ==2">
@@ -1078,7 +1078,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           (2,3)
         </if>
         <if test="manageType ==1">
-          (6,7)
+          (5,6)
         </if>
 
       </if>
@@ -1088,13 +1088,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         and a.approval = 0
       </if>
       <if test="approval ==1">
-        and a.approval in (1,4,7)
+        and a.approval in (1,4)
       </if>
       <if test="approval ==2">
-        and a.approval in (2,5,8)
+        and a.approval in (2,4)
       </if>
       <if test="approval ==4">
-        and a.approval in (1,2,4,5,7,8)
+        and a.approval in (1,2,4,5)
       </if>
     </if>
     <if test="specially == 4">