This commit is contained in:
suyl
2021-09-13 17:14:52 +08:00
parent b439cd5ef4
commit 5465f8ffe6

View File

@@ -269,6 +269,11 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
sqlFromParams = append(sqlFromParams, cond)
sqlVendorStoreCond += " " + mapCond + " " + tableAlias + ".id IS NOT NULL"
}
if keyword != "" {
keywordLike := "%" + keyword + "%"
sqlVendorStoreCond += " AND " + tableAlias + ".vendor_store_name LIKE ? "
sqlFromParams = append(sqlFromParams, keywordLike)
}
}
}
if sqlVendorStoreCond != "" {
@@ -299,10 +304,10 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
sqlWhereParams = append(sqlWhereParams, keywordInt64, keywordInt64, keywordInt64, keywordInt64)
if jxutils.GuessVendorIDFromVendorStoreID(keywordInt64) != model.VendorIDUnknown {
sqlWhere += `
OR (SELECT COUNT(*) FROM store_map tsm WHERE t1.id = tsm.store_id AND tsm.deleted_at = ? AND (tsm.vendor_store_id = ? OR tsm.vendor_store_name LIKE ?)) > 0
OR (SELECT COUNT(*) FROM store_map tsm WHERE t1.id = tsm.store_id AND tsm.deleted_at = ? AND tsm.vendor_store_id = ?) > 0
OR (SELECT COUNT(*) FROM store_courier_map tsm WHERE t1.id = tsm.store_id AND tsm.deleted_at = ? AND tsm.vendor_store_id = ?) > 0
`
sqlWhereParams = append(sqlWhereParams, utils.DefaultTimeValue, keyword, keywordLike, utils.DefaultTimeValue, keyword)
sqlWhereParams = append(sqlWhereParams, utils.DefaultTimeValue, keyword, utils.DefaultTimeValue, keyword)
}
}
sqlWhere += ")"