|
|
@@ -534,7 +534,8 @@ if (!empty($keyscode)) {
|
|
|
OR cc.facebook_3 LIKE '%$keyscode%'
|
|
|
OR cc.alibaba_1 LIKE '%$keyscode%'
|
|
|
OR cc.alibaba_2 LIKE '%$keyscode%'
|
|
|
- OR cc.alibaba_3 LIKE '%$keyscode%')";
|
|
|
+ OR cc.alibaba_3 LIKE '%$keyscode%'
|
|
|
+ OR c.id IN (SELECT customerId FROM tagtable WHERE tagName LIKE '%$keyscode%'))";
|
|
|
}
|
|
|
|
|
|
$sqlStr .= " $fliterStr ORDER BY {$ordStr}c.cs_updatetime DESC";
|
|
|
@@ -628,7 +629,7 @@ $hrefstr = "?keys=" . $keys;
|
|
|
<select name="fliterCountry" class="filterSearch">
|
|
|
<option value="">请选择国家地区</option>
|
|
|
<?php
|
|
|
- $result = $conn->query("SELECT id, countryName FROM country");
|
|
|
+ $result = $conn->query("SELECT id, countryName FROM country ORDER BY CONVERT(countryName USING gbk) COLLATE gbk_chinese_ci ASC");
|
|
|
while ($row = $result->fetch_assoc()) {
|
|
|
$selected = ($filters['Country'] == $row['id']) ? ' selected' : '';
|
|
|
echo "<option value=\"{$row['id']}\"$selected>{$row['countryName']}</option>";
|
|
|
@@ -763,7 +764,8 @@ $hrefstr = "?keys=" . $keys;
|
|
|
OR cc.facebook_3 LIKE '%$searchPattern%'
|
|
|
OR cc.alibaba_1 LIKE '%$searchPattern%'
|
|
|
OR cc.alibaba_2 LIKE '%$searchPattern%'
|
|
|
- OR cc.alibaba_3 LIKE '%$searchPattern%')";
|
|
|
+ OR cc.alibaba_3 LIKE '%$searchPattern%'
|
|
|
+ OR c.id IN (SELECT customerId FROM tagtable WHERE tagName LIKE '%$searchPattern%'))";
|
|
|
}
|
|
|
|
|
|
$sql .= " $filterStr ORDER BY c.colortag DESC, c.id DESC";
|
igb