wanglt пре 3 месеци
родитељ
комит
7a7a06571d
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

+ 2 - 2
ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -745,7 +745,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </foreach>
                 </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
-                AND p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status='archived'
+                AND p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status IN ('completed','archived')
             </where>
 
             UNION ALL
@@ -812,7 +812,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </foreach>
                 </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
-                AND p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status='archived'
+                AND p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status IN ('completed','archived')
             </where>
             ) o
         <where>