备份

ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml

@@ -45,18 +45,13 @@
             AND YEAR(osi.sign_time) = YEAR(#{payTime})
             AND MONTH(osi.sign_time) = MONTH(#{payTime})
             LEFT JOIN sys_user su ON os.user_id = su.user_id
-
-            <!-- 这里使用 <where> 标签统一管理条件 -->
             <where>
                 YEAR(os.pay_time) = YEAR(#{payTime})
                 AND MONTH(os.pay_time) = MONTH(#{payTime})
-
-                <!-- 如果 ew 中带了自定义条件，就在这里追加 -->
                 <if test="ew != null and ew.customSqlSegment != null and ew.customSqlSegment != ''">
                     AND ${ew.customSqlSegment}
                 </if>
             </where>
-
             GROUP BY
             os.salary_id,
             os.user_id,