diff --git a/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml b/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml index fe5b09cd..0d6837f2 100644 --- a/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml +++ b/code/link56/link56-backend-old/src/main/resources/cn/link56/mapper/WebAreaMapper.xml @@ -44,6 +44,7 @@ ORDER BY b_name ASC + + + SELECT + sheng.b_name AS shengName, + shi.b_name AS shiName, + + c.b_id AS companyId, + c.b_name AS companyName, + c.b_recommend_color AS color + FROM b_area_shi shi + JOIN b_area_sheng sheng + ON shi.b_father_id = sheng.b_id + + LEFT JOIN b_company c + ON c.b_canuse = '1' + AND c.b_recommend = '1' + AND c.b_address LIKE '%' + shi.b_name + '%' + + WHERE + shi.b_canuse = '1' + AND shi.b_visible = '1' + AND sheng.b_canuse = '1' + + ORDER BY + sheng.b_order ASC, + shi.b_order ASC + + + diff --git a/code/link56/link56-frontend-new/src/App.vue b/code/link56/link56-frontend-new/src/App.vue index 9d1105c2..fd69cb23 100644 --- a/code/link56/link56-frontend-new/src/App.vue +++ b/code/link56/link56-frontend-new/src/App.vue @@ -24,6 +24,7 @@ function handleInitData() { console.log(err) ElMessage.error('初始化失败,请刷新页面后重试') }) + } diff --git a/code/link56/link56-frontend-new/src/components/QueryCompany.vue b/code/link56/link56-frontend-new/src/components/QueryCompany.vue index e440e30e..bd4e566e 100644 --- a/code/link56/link56-frontend-new/src/components/QueryCompany.vue +++ b/code/link56/link56-frontend-new/src/components/QueryCompany.vue @@ -1,43 +1,19 @@