|
|
@@ -356,7 +356,7 @@ func ProjectHandle(data *[]map[string]interface{}, users *[]map[string]interface
|
|
|
project_id := common.InterfaceToStr(common.InterfaceToStr(v["project_id"]))
|
|
|
if (*result)[userId] != nil {
|
|
|
stage := common.ObjToString(v["bid_stage"])
|
|
|
- if _, ok := (*result)[userId].StageStr[project_id]; !ok {
|
|
|
+ if (*result)[userId].StageStr == nil {
|
|
|
(*result)[userId].StageStr = map[string]string{}
|
|
|
}
|
|
|
(*result)[userId].StageStr[project_id] = stage
|
|
|
@@ -1029,7 +1029,7 @@ func getNewPushInfo(projectIds []string, req *bxcore.ProjectDetailsReq) *[]map[s
|
|
|
sql := `
|
|
|
SELECT
|
|
|
project_id,
|
|
|
- GROUP_CONCAT(distinct(source)) ,
|
|
|
+ GROUP_CONCAT(distinct(source)) as source,
|
|
|
DATE_FORMAT(min(visit_date), '%%Y-%%m-%%d') AS visit_date,
|
|
|
DATE_FORMAT( min(dis_date), '%%Y-%%m-%%d') AS dis_date
|
|
|
FROM participate_push_statistics
|
