Merge branch 'dev_v1.0.4_wh' of CRM/application into feature/v1.0.4

api/internal/service/owner.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"
 
 	"app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/es"
@@ -788,10 +789,10 @@ func (t *OwnerService) OwnerCooperate() []map[string]interface{} {
 		for _, m := range dataArr {
 			zbtime := m.Zbtime
 			returData = append(returData, map[string]interface{}{
-				"zbtime":       zbtime,
-				"entName":      t.WinnerName,
-				"project_id":   encrypt.EncodeArticleId2ByCheck(m.Project_id),
-				"project_name": m.Project_name,
+				"zbtime":      common.If(zbtime == 0, "", time.Unix(zbtime, 10).Format("2006.01.02")),
+				"entName":     t.WinnerName,
+				"projectId":   encrypt.EncodeArticleId2ByCheck(m.Project_id),
+				"projectName": m.Project_name,
 			})
 		}
 	}