|
@@ -161,10 +161,11 @@ func PushHandle(data *[]map[string]interface{}, users *[]map[string]interface{})
|
|
|
}
|
|
|
func ProjectHandle(data *[]map[string]interface{}, users *[]map[string]interface{}) []*bxcore.ProjectStatisticsData {
|
|
|
result := &map[int64]*ProjectData{}
|
|
|
- for _, v := range *users {
|
|
|
+ for k, v := range *users {
|
|
|
(*result)[common.Int64All(v["id"])] = &ProjectData{
|
|
|
- PersonName: common.InterfaceToStr(v["name"]),
|
|
|
+ PersonName: fmt.Sprintf("%s_%d", common.InterfaceToStr(v["name"]), k),
|
|
|
DepartmentName: common.InterfaceToStr(v["dept_name"]),
|
|
|
+ entUserId: common.InterfaceToStr(v["id"]),
|
|
|
}
|
|
|
}
|
|
|
for _, v := range *data {
|