aa

business/jxstore/cms/job.go

@@ -1960,8 +1960,8 @@ func TempJob() (err error) {
 }
 
 type GetUnionActListResult struct {
-	actList *partner.ActivityList
-	JobID   int `orm:"column(job_id)" json:"jobID"`
+	partner.ActivityList
+	JobID int `orm:"column(job_id)" json:"jobID"`
 }
 
 func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (results []*GetUnionActListResult, err error) {
@@ -1969,9 +1969,15 @@ func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (results []*
 		actList, err2 := handler.GetUnionActList(ctx, actType)
 		if err2 == nil {
 			for _, v := range actList {
-				result := &GetUnionActListResult{
-					actList: v,
-				}
+				result := &GetUnionActListResult{}
+				result.ActID = v.ActID
+				result.Img = v.Img
+				result.DateEnd = v.DateEnd
+				result.DateBegin = v.DateBegin
+				result.ActDes = v.ActDes
+				result.ActName = v.ActName
+				result.ActSrc = v.ActSrc
+				result.Ratio = v.Ratio
 				var job *model.Job
 				sql := `
 					SELECT * FROM job WHERE vendor_id = ? AND union_act_id = ? AND type = ?