Merge remote-tracking branch 'origin/bd_test' into bd_test
This commit is contained in:
commit
1e4763c812
|
@ -3216,7 +3216,7 @@
|
||||||
LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
|
LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
|
||||||
LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
|
LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
|
||||||
where 1=1
|
where 1=1
|
||||||
AND cmrr.PK_MEMBER IN (#{userId} )
|
AND cmrr.PK_MEMBER NOT IN (#{userId} )
|
||||||
<if test="type != null and type == 1">
|
<if test="type != null and type == 1">
|
||||||
and cmrr.PROVINCE != 0
|
and cmrr.PROVINCE != 0
|
||||||
and cmrr.CITY = 0
|
and cmrr.CITY = 0
|
||||||
|
@ -3233,6 +3233,7 @@
|
||||||
and cmrr.COUNTY != 0
|
and cmrr.COUNTY != 0
|
||||||
</if>
|
</if>
|
||||||
)
|
)
|
||||||
|
order by ba.pk_id asc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue