|
@ -421,7 +421,7 @@ |
|
|
SELECT |
|
|
SELECT |
|
|
cg.id gridId, |
|
|
cg.id gridId, |
|
|
CONCAT( |
|
|
CONCAT( |
|
|
ca.organization_name, |
|
|
cu.organization_name, |
|
|
"-", |
|
|
"-", |
|
|
cg.grid_name |
|
|
cg.grid_name |
|
|
) agencyGridName, |
|
|
) agencyGridName, |
|
@ -431,6 +431,7 @@ |
|
|
IFNULL(cg.latitude, ca.latitude) latitude |
|
|
IFNULL(cg.latitude, ca.latitude) latitude |
|
|
FROM |
|
|
FROM |
|
|
customer_grid cg |
|
|
customer_grid cg |
|
|
|
|
|
INNER JOIN customer_agency cu ON cu.id = cg.pid AND cu.customer_id = cg.customer_id |
|
|
INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id |
|
|
INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id |
|
|
WHERE |
|
|
WHERE |
|
|
cg.del_flag = '0' |
|
|
cg.del_flag = '0' |
|
|