3.17优化

ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml

@@ -44,9 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN wgz_user b ON (a.user_id = b.user_id and b.del_flag = 0)
         WHERE
             a.user_id = #{req.userId} and
-            DATE_FORMAT(dily_time, '%Y-%m-%d') = #{req.rq} and
+            <if test="req.rq!=null">
+                DATE_FORMAT(a.dily_time, '%Y-%m-%d') = #{req.rq} and
+            </if>
             <if test="req.types != 2">
-                status = #{req.types} and
+                a.status = #{req.types} and
             </if>
             a.del_flag = 0
         ORDER BY