WH01243 1 سال پیش
والد
کامیت
bc14b7c7ca
2فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 5 1
      src/jfw/modules/bigmember/src/entity/report.go
  2. 1 1
      src/jfw/modules/bigmember/src/service/report/report.go

+ 5 - 1
src/jfw/modules/bigmember/src/entity/report.go

@@ -132,7 +132,7 @@ func GetReportProjectInfo(param *ReportProjectInfoParam, positionId int64) (data
 }
 
 // ReportProjectInfoFormat 周报/月报 项目明细 格式化数据
-func ReportProjectInfoFormat(data []map[string]interface{}) []map[string]interface{} {
+func ReportProjectInfoFormat(data []map[string]interface{}, from string) []map[string]interface{} {
 	rs := []map[string]interface{}{}
 	for i := 0; i < len(data); i++ {
 		tmp := map[string]interface{}{}
@@ -148,6 +148,10 @@ func ReportProjectInfoFormat(data []map[string]interface{}) []map[string]interfa
 			winIdArr = append(winIdArr, splitWinnerId[j])
 		}
 		tmp["id"] = encrypt.EncodeArticleId2ByCheck(common.ObjToString(data[i]["source_infoid"]))
+		if from == From {
+			tmp["id"] = common.ObjToString(data[i]["source_infoid"])
+		}
+
 		tmp["winnerId"] = winIdArr
 		tmp["winner"] = strings.Split(tmpWinner, ",")
 		tmp["name"] = common.ObjToString(data[i]["name"])

+ 1 - 1
src/jfw/modules/bigmember/src/service/report/report.go

@@ -251,7 +251,7 @@ func (r *Report) ProjectInfo() {
 	}
 	m := map[string]interface{}{}
 	list, total := entity.GetReportProjectInfo(&param, positionId)
-	m["list"] = entity.ReportProjectInfoFormat(list)
+	m["list"] = entity.ReportProjectInfoFormat(list, param.From)
 	m["total"] = total
 	r.ServeJson(Result{
 		Data: m,