@@ -202,6 +202,8 @@
AND a2.DELETED = '0'
AND a3.DELETED = '0'
AND a6.DELETED='0'
+ and (a1.PROCESSDEVICE is not null and a1.PROCESSDEVICE !='' )
+ and (a1.PROCESSWORKSHOP is not null and a1.PROCESSWORKSHOP !='' )
<if test="ids != null and ids.size()>0">
and a1.ID in
<foreach collection="ids" item="id" open="(" close=")" separator=",">