Commit 820a4620491c71418b998b223de502d5591ae610

Authored by 张志伟
2 parents def8ace4 744167fa

Merge remote-tracking branch 'origin/test'

fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
@@ -91,10 +91,10 @@ @@ -91,10 +91,10 @@
91 ) 91 )
92 </if> 92 </if>
93 <if test="condition.closeTime1 !=null"> 93 <if test="condition.closeTime1 !=null">
94 - and t1.close_time >= #{closeTime1} 94 + and t1.close_time >= #{condition.closeTime1}
95 </if> 95 </if>
96 <if test="condition.closeTime2 !=null"> 96 <if test="condition.closeTime2 !=null">
97 - and t1.close_time &lt;= #{closeTime2} 97 + and t1.close_time &lt;= #{condition.closeTime2}
98 </if> 98 </if>
99 <if test="condition.state !=null"> 99 <if test="condition.state !=null">
100 and t1.state = #{condition.state} 100 and t1.state = #{condition.state}
@@ -182,10 +182,10 @@ @@ -182,10 +182,10 @@
182 ) 182 )
183 </if> 183 </if>
184 <if test="condition.closeTime1 !=null"> 184 <if test="condition.closeTime1 !=null">
185 - and t1.close_time >= #{closeTime1} 185 + and t1.close_time >= #{condition.closeTime1}
186 </if> 186 </if>
187 <if test="condition.closeTime2 !=null"> 187 <if test="condition.closeTime2 !=null">
188 - and t1.close_time &lt;= #{closeTime2} 188 + and t1.close_time &lt;= #{condition.closeTime2}
189 </if> 189 </if>
190 <if test="condition.state !=null"> 190 <if test="condition.state !=null">
191 and t1.state = #{condition.state} 191 and t1.state = #{condition.state}