|
|
@@ -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>
|