Merge remote-tracking branch 'origin/master'

This commit is contained in:
ly19960718 2021-05-05 15:26:23 +08:00
commit ac5112571f

View File

@ -292,8 +292,15 @@
<if test="orgId != null">
AND t1.org_id = #{orgId}
</if>
<if test="repotType != null and repotType != ''">
AND t1.report_type = #{repotType}
<if test="reportType != null and reportType != ''">
AND t1.report_type = #{reportType}
</if>
<if test="signNowDate != null and signNowDate != ''">
AND t1.sign_up_start_time <![CDATA[ <= ]]> #{signNowDate}
AND t1.sign_up_end_time <![CDATA[ >= ]]> #{signNowDate}
</if>
<if test="planType != null and planType != ''">
AND t1.plan_type = #{planType}
</if>
<if test="keywords != null and keywords != ''">
AND (