1

business/model/dao/lakala.go

@@ -112,11 +112,11 @@ func GetIncoming(storeID int, merchantNo string, offset, pageSize int) (pagedInf
 				 JOIN store s ON l.store_id = s.id 
              WHERE 1=1 `
 	if storeID != 0 {
-		sql += ` AND s.store_id = ? `
+		sql += ` AND s.id = ? `
 		param = append(param, storeID)
 	}
 	if merchantNo != "" {
-		sql += ` AND s.merchant_no = ?`
+		sql += ` AND l.merchant_no = ?`
 		param = append(param, merchantNo)
 	}
 	sql += `