@@ -1740,7 +1740,7 @@
) r
ON u.id = r.creator_id
WHERE u.company_id=#{companyId}
- AND workTime>0 AND u.`is_active`=1
+ AND (workTime>0 OR u.`is_active`=1)
<if test="area!=null and area != '' ">
and u.plate1 = #{area}
</if>