|
@@ -130,6 +130,7 @@ WHERE a.s_entId = '%s' and a.s_userid = '%s'`, this.SaveTable, entId, this.UserI
|
|
|
type EntFollowGroup struct {
|
|
|
Id string `json:"id"`
|
|
|
Name string `json:"name"`
|
|
|
+ IsPut int `json:"isPut"`
|
|
|
Count int `json:"count"`
|
|
|
}
|
|
|
|
|
@@ -155,7 +156,7 @@ func (this *EntFollow) GetEntFollowList(pNum, pSize int, match, groups string) (
|
|
|
followDataAll []map[string]interface{}
|
|
|
)
|
|
|
groupMap := make(map[string]int)
|
|
|
- data := db.Base.SelectBySql(fmt.Sprintf(`SELECT id,s_name FROM follow_ent_monitor_group WHERE s_userid = '%s' ORDER BY isdefGoup desc, create_time desc`, this.UserId))
|
|
|
+ data := db.Base.SelectBySql(fmt.Sprintf(`SELECT id,s_name,isPut FROM follow_ent_monitor_group WHERE s_userid = '%s' ORDER BY isdefGoup desc, create_time desc`, this.UserId))
|
|
|
if data != nil && len(*data) > 0 {
|
|
|
for _, m := range *data {
|
|
|
groupMap[qutil.InterfaceToStr(m["id"])] = 0
|
|
@@ -224,6 +225,7 @@ func (this *EntFollow) GetEntFollowList(pNum, pSize int, match, groups string) (
|
|
|
groupUserArr = append(groupUserArr, EntFollowGroup{
|
|
|
util.EncodeId(qutil.InterfaceToStr(m["id"])),
|
|
|
qutil.InterfaceToStr(m["s_name"]),
|
|
|
+ qutil.IntAll(m["isPut"]),
|
|
|
groupMap[qutil.InterfaceToStr(m["id"])],
|
|
|
})
|
|
|
}
|