Showing
1 changed file
with
39 additions
and
30 deletions
| ... | ... | @@ -186,40 +186,49 @@ |
| 186 | 186 | AND tb.standard_approved = #{vo.standardApproved} |
| 187 | 187 | </if> |
| 188 | 188 | <if test="vo.workshopIdList != null and vo.workshopIdList.size() > 0"> |
| 189 | - OR tb.workshop_id IN | |
| 189 | + AND tb.workshop_id IN | |
| 190 | 190 | <foreach collection="vo.workshopIdList" open="(" separator="," close=")" item="item"> |
| 191 | 191 | #{item} |
| 192 | 192 | </foreach> |
| 193 | 193 | </if> |
| 194 | - <choose> | |
| 195 | - <when test="vo.contractIdList != null and vo.contractIdList.size() > 0"> | |
| 196 | - AND (tb.id IN | |
| 197 | - <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item"> | |
| 198 | - #{item} | |
| 199 | - </foreach> | |
| 200 | - <if test="vo.createById != null and vo.createById != ''"> | |
| 201 | - OR tb.create_by_id = #{vo.createById} | |
| 202 | - </if> | |
| 203 | - <if test="vo.createByIdList != null and vo.createByIdList.size() > 0"> | |
| 204 | - OR tb.create_by_id IN | |
| 205 | - <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item"> | |
| 206 | - #{item} | |
| 207 | - </foreach> | |
| 208 | - </if> | |
| 209 | - ) | |
| 210 | - </when> | |
| 211 | - <otherwise> | |
| 212 | - <if test="vo.createById != null and vo.createById != ''"> | |
| 213 | - AND tb.create_by_id = #{vo.createById} | |
| 214 | - </if> | |
| 215 | - <if test="vo.createByIdList != null and vo.createByIdList.size() > 0"> | |
| 216 | - AND tb.create_by_id IN | |
| 217 | - <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item"> | |
| 218 | - #{item} | |
| 219 | - </foreach> | |
| 220 | - </if> | |
| 221 | - </otherwise> | |
| 222 | - </choose> | |
| 194 | + <if test="vo.createById != null and vo.createById != ''"> | |
| 195 | + AND tb.create_by_id = #{vo.createById} | |
| 196 | + </if> | |
| 197 | + <if test="vo.createByIdList != null and vo.createByIdList.size() > 0"> | |
| 198 | + AND tb.create_by_id IN | |
| 199 | + <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item"> | |
| 200 | + #{item} | |
| 201 | + </foreach> | |
| 202 | + </if> | |
| 203 | +<!-- <choose>--> | |
| 204 | +<!-- <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">--> | |
| 205 | +<!-- AND (tb.id IN--> | |
| 206 | +<!-- <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">--> | |
| 207 | +<!-- #{item}--> | |
| 208 | +<!-- </foreach>--> | |
| 209 | +<!-- <if test="vo.createById != null and vo.createById != ''">--> | |
| 210 | +<!-- OR tb.create_by_id = #{vo.createById}--> | |
| 211 | +<!-- </if>--> | |
| 212 | +<!-- <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">--> | |
| 213 | +<!-- OR tb.create_by_id IN--> | |
| 214 | +<!-- <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">--> | |
| 215 | +<!-- #{item}--> | |
| 216 | +<!-- </foreach>--> | |
| 217 | +<!-- </if>--> | |
| 218 | +<!-- )--> | |
| 219 | +<!-- </when>--> | |
| 220 | +<!-- <otherwise>--> | |
| 221 | +<!-- <if test="vo.createById != null and vo.createById != ''">--> | |
| 222 | +<!-- AND tb.create_by_id = #{vo.createById}--> | |
| 223 | +<!-- </if>--> | |
| 224 | +<!-- <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">--> | |
| 225 | +<!-- AND tb.create_by_id IN--> | |
| 226 | +<!-- <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">--> | |
| 227 | +<!-- #{item}--> | |
| 228 | +<!-- </foreach>--> | |
| 229 | +<!-- </if>--> | |
| 230 | +<!-- </otherwise>--> | |
| 231 | +<!-- </choose>--> | |
| 223 | 232 | </where> |
| 224 | 233 | order by tb.create_time desc |
| 225 | 234 | </select> | ... | ... |