|
|
@@ -40,7 +40,7 @@ func (l *GetViewStatusLogic) GetViewStatus(in *bxsubscribe.GetViewStatusReq) (*b
|
|
|
)
|
|
|
res := new(bxsubscribe.ViewStatusResp)
|
|
|
|
|
|
- finsql = `SELECT userid,isvisit,visittime,date FROM pushentniche where infoid =? and type in (2,3) order By date desc`
|
|
|
+ finsql = `SELECT userid,isvisit,visittime,date FROM pushentniche where infoid =? and source in (2,3) order By date asc`
|
|
|
if user.Role_admin_department {
|
|
|
users = model.GetDisUsers(common.IntAll(in.EntId), user.Dept.Id)
|
|
|
if users != nil && len(*users) > 0 {
|
|
|
@@ -57,7 +57,7 @@ func (l *GetViewStatusLogic) GetViewStatus(in *bxsubscribe.GetViewStatusReq) (*b
|
|
|
users = model.GetEntUsers(common.IntAll(in.EntId))
|
|
|
}
|
|
|
if len(ss) > 0 {
|
|
|
- finsql = fmt.Sprintf(`SELECT userid,isvisit,visittime,date FROM pushentniche where infoid =? and type in (2,3) %s order By date asc`, fmt.Sprintf(`and userid in (%s)`, strings.Join(ss, ",")))
|
|
|
+ finsql = fmt.Sprintf(`SELECT userid,isvisit,visittime,date FROM pushentniche where infoid =? and source in (2,3) %s order By date asc`, fmt.Sprintf(`and userid in (%s)`, strings.Join(ss, ",")))
|
|
|
}
|
|
|
data := IC.BaseServiceMysql.SelectBySql(finsql, in.InfoId)
|
|
|
userMap := make(map[int]string)
|
