|
|
@@ -1667,7 +1667,7 @@ select to_char(t.PERFORMANCEPLANID) PERFORMANCEPLANID,
|
|
|
on t.sellaccountid = a2.accountid
|
|
|
left join useraccount u2
|
|
|
on a2.userid = u2.userid
|
|
|
- left join his_performancestep k
|
|
|
+ left join (select * from his_performancestep where isvaliddata=1) k
|
|
|
on t.curstepid = k.performancestepid
|
|
|
left join performancesteptype s
|
|
|
on k.steptypeid = s.steptypeid
|
|
|
@@ -1676,7 +1676,7 @@ select to_char(t.PERFORMANCEPLANID) PERFORMANCEPLANID,
|
|
|
left join tmp
|
|
|
on f.wrfactortypeid = tmp.wrfactortypeid
|
|
|
left join market m on t.marketid=m.marketid
|
|
|
- where 1 = 1 and t.isvaliddata=1 and k.isvaliddata=1
|
|
|
+ where 1 = 1 and t.isvaliddata=1
|
|
|
`
|
|
|
if r.BUYORSELL == 0 {
|
|
|
sqlId.And("u1.userid", r.USERID)
|