Merge branch 'cygx_10.9.1' into debug

controllers/company.go

@@ -9142,7 +9142,6 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		br.ErrMsg = "获取任务信息失败,err:" + err.Error()
 		return
 	}
-	resp := make([]*cygx.CygxActivitySpecialPointsBillResp, 0)
 
 	specialSurplus, err := cygxService.GetSpecialSurplusByCompany(companyId)
 	if err != nil {
@@ -9150,8 +9149,9 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
 		return
 	}
+	resp := new(cygx.CygxActivitySpecialPointsBillResp)
 	for _, v := range list {
-		item := cygx.CygxActivitySpecialPointsBillResp{
+		item := cygx.CygxActivitySpecialPointsBillRespItem{
 			Id:                  v.Id,
 			Content:             v.ActivityName,
 			Total:               specialSurplus,
@@ -9164,7 +9164,7 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 			ChartPermissionId:   v.ChartPermissionId,
 			ChartPermissionName: v.ChartPermissionName,
 		}
-		resp = append(resp, &item)
+		resp.List = append(resp.List, &item)
 	}
 
 	br.Ret = 200