优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -434,13 +434,20 @@
             <if test=" startDate !=null and endDate !=null">
                 and c.work_day between #{startDate} and #{endDate}
             </if>
-            ) or (c.work_day is null and u.submit_order = 1 and u.`status` = 1)
             <if test="depts !=null and depts.size()>0">
                 AND d.id in
                 <foreach collection="depts" item="dept" open="(" close=")" separator=",">
                     #{dept}
                 </foreach>
             </if>
+            ) or (c.work_day is null and u.submit_order = 1 and u.`status` = 1
+            <if test="depts !=null and depts.size()>0">
+                AND d.id in
+                <foreach collection="depts" item="dept" open="(" close=")" separator=",">
+                    #{dept}
+                </foreach>
+            </if>)
+
         </where>
         ORDER BY CONVERT( u.name USING gbk )