|
|
@@ -716,7 +716,7 @@ func (n *network) Introduce_Firstparty(fpn map[string][]*firstpartyNetwork, entM
|
|
|
q := `select buyer_id,count(project_id) AS project_count,sum(project_money) AS project_amount,groupUniqArray(project_id) from information.transaction_info where buyer_id in (` + wh + `)`
|
|
|
if matchme == 1 {
|
|
|
newWh, newArgs := NetworkCom.WhArgs(probusfors)
|
|
|
- q += ` hasAny(property_form,[` + newWh + `])`
|
|
|
+ q += ` and hasAny(property_form,[` + newWh + `])`
|
|
|
args = append(args, newArgs...)
|
|
|
}
|
|
|
q += ` group by buyer_id`
|
|
|
@@ -779,7 +779,7 @@ func (n *network) Introduce_Supplier(values []string, entMonitor map[string]bool
|
|
|
inner join information.transaction_info b on (hasAny(a.winner_id,[` + wh + `]) and a.buyer_id<>'' and a.buyer_id=b.buyer_id`
|
|
|
if matchme == 1 {
|
|
|
newWh, newArgs := NetworkCom.WhArgs(probusfors)
|
|
|
- q += ` hasAny(b.property_form,[` + newWh + `])`
|
|
|
+ q += ` and hasAny(b.property_form,[` + newWh + `])`
|
|
|
args = append(args, newArgs...)
|
|
|
}
|
|
|
q += `) group by a.winner_id`
|
|
|
@@ -835,7 +835,7 @@ func (n *network) Introduce_Agency(values []string, entMonitor map[string]bool,
|
|
|
inner join information.transaction_info b on (a.agency_id in (` + wh + `) and a.buyer_id<>'' and a.buyer_id=b.buyer_id`
|
|
|
if matchme == 1 {
|
|
|
newWh, newArgs := NetworkCom.WhArgs(probusfors)
|
|
|
- q += ` hasAny(b.property_form,[` + newWh + `])`
|
|
|
+ q += ` and hasAny(b.property_form,[` + newWh + `])`
|
|
|
args = append(args, newArgs...)
|
|
|
}
|
|
|
q += `) group by a.agency_id`
|
