|
@@ -109,7 +109,6 @@ func (this *CompanyUserController) AddUser() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//权益类客户,邮箱必填(2021-03-22 13:32:59修改)
|
|
|
if productId == 1 || regionType == "国内" { //ficc类客户
|
|
|
if req.MobileOne == "" && req.Email == "" {
|
|
@@ -3378,7 +3377,18 @@ func (this *CompanyUserController) ViewReportList() {
|
|
|
for _, v := range recordList {
|
|
|
tmpKey := fmt.Sprint(v.Source, "_", v.ReportId)
|
|
|
if tmpInfo, ok := viewReportMap[tmpKey]; ok {
|
|
|
- list = append(list, &tmpInfo)
|
|
|
+ stopTime := `--`
|
|
|
+ if v.StopTime > 0 {
|
|
|
+ stopTime = fmt.Sprint(v.StopTime)
|
|
|
+ }
|
|
|
+ list = append(list, &company.ViewReportList{
|
|
|
+ ResearchReportName: tmpInfo.ResearchReportName,
|
|
|
+ ReportType: tmpInfo.ReportType,
|
|
|
+ CreatedTime: v.CreateTime,
|
|
|
+ TxtType: tmpInfo.TxtType,
|
|
|
+ MatchTypeName: tmpInfo.MatchTypeName,
|
|
|
+ StopTime: stopTime,
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
|