liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-09-13 18:35:37 +08:00
parent 11e63cab25
commit 6eea38a0c7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxstore/cms/store.go
View File

@@ -226,6 +226,7 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
sqlWhereParams := []interface{}{ sqlWhereParams := []interface{}{
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
tableAliasMap := make(map[string]*struct{})
for mapCondKey, tableName := range map[string]string{ for mapCondKey, tableName := range map[string]string{
"vendorStoreCond": "store_map", "vendorStoreCond": "store_map",
"courierStoreCond": "store_courier_map", "courierStoreCond": "store_courier_map",
@@ -269,11 +270,7 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
sqlFromParams = append(sqlFromParams, cond) sqlFromParams = append(sqlFromParams, cond)
sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NOT NULL" sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NOT NULL"
} }
if keyword != "" { tableAliasMap[tableAlias] = &struct{}{}
keywordLike := "%" + keyword + "%"
sqlVendorStoreCond += " AND " + tableAlias + ".vendor_store_name LIKE ? "
sqlWhereParams = append(sqlWhereParams, keywordLike)
}
} }
} }
if sqlVendorStoreCond != "" { if sqlVendorStoreCond != "" {
@@ -289,6 +286,13 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike,
keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
if len(tableAliasMap) > 0 {
for k, _ := range tableAliasMap {
sqlWhere += ` OR ` + k + ".vendor_store_name LIKE ?"
sqlWhereParams = append(sqlWhereParams, keywordLike)
}
}
if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil { if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
if true { // jxutils.IsLegalMobileNumber(keywordInt64) { if true { // jxutils.IsLegalMobileNumber(keywordInt64) {
sqlWhere += ` OR ( sqlWhere += ` OR (