|
|
@ -128,7 +128,7 @@ |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' "> |
|
|
|
<if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category111' "> |
|
|
|
<if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]"> |
|
|
|
<foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close=""> |
|
|
|
<if test="colValue != null and colValue != ''"> |
|
|
@ -137,6 +137,15 @@ |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' "> |
|
|
|
<if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]"> |
|
|
|
<foreach collection="subCondition.columnValue" item="colValue" open=" and (" separator="or" close=")"> |
|
|
|
<if test="colValue != null and colValue != ''"> |
|
|
|
and ${subCondition.tableName}.${colValue} ='1' |
|
|
|
</if> |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|