|
@ -458,6 +458,7 @@ |
|
|
WHERE |
|
|
WHERE |
|
|
grid.del_flag = 0 |
|
|
grid.del_flag = 0 |
|
|
and grid.SYNC_FLAG='1' |
|
|
and grid.SYNC_FLAG='1' |
|
|
|
|
|
and grid.ABANDON_FLAG='0' |
|
|
<if test='areaCode != "" and areaCode != null'> |
|
|
<if test='areaCode != "" and areaCode != null'> |
|
|
AND grid.area_code LIKE CONCAT(#{areaCode},'%') |
|
|
AND grid.area_code LIKE CONCAT(#{areaCode},'%') |
|
|
</if> |
|
|
</if> |
|
@ -498,6 +499,7 @@ |
|
|
WHERE |
|
|
WHERE |
|
|
a.del_flag = 0 |
|
|
a.del_flag = 0 |
|
|
and a.SYNC_FLAG='1' |
|
|
and a.SYNC_FLAG='1' |
|
|
|
|
|
and a.ABANDON_FLAG='0' |
|
|
AND a.customer_id = #{customerId} |
|
|
AND a.customer_id = #{customerId} |
|
|
) AS c |
|
|
) AS c |
|
|
ORDER BY CONVERT ( gridName USING gbk ) ASC |
|
|
ORDER BY CONVERT ( gridName USING gbk ) ASC |
|
|