驾驶舱-去除作废工单

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

@@ -618,7 +618,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 p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status!='invalid'
             </where>
 
             UNION ALL
@@ -683,7 +683,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 p.dept_name IS NOT NULL AND wo.work_order_status IS NOT NULL AND wo.work_order_status!='invalid'
             </where>
             ) o
         <where>