|
@@ -524,6 +524,9 @@ func (this *ActivityCoAntroller) ScheduleList() {
|
|
}
|
|
}
|
|
expertTxt, _ := services.GetReportContentTextSub(v.Expert)
|
|
expertTxt, _ := services.GetReportContentTextSub(v.Expert)
|
|
list[k].Expert = expertTxt
|
|
list[k].Expert = expertTxt
|
|
|
|
+ if v.IsHideAppointment == 0 {
|
|
|
|
+ list[k].IsShowAppointment = services.IsShowAppointment(v.ActivityTypeId, v.ChartPermissionName)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
//添加我的日程访问记录
|
|
//添加我的日程访问记录
|
|
item := new(models.CygxPageHistoryRecord)
|
|
item := new(models.CygxPageHistoryRecord)
|
|
@@ -818,6 +821,9 @@ func (this *ActivityCoAntroller) Detail() {
|
|
if activityInfo.ChartPermissionNames != "" {
|
|
if activityInfo.ChartPermissionNames != "" {
|
|
activityInfo.ChartPermissionName = activityInfo.ChartPermissionNames
|
|
activityInfo.ChartPermissionName = activityInfo.ChartPermissionNames
|
|
}
|
|
}
|
|
|
|
+ if activityInfo.IsHideAppointment == 0 {
|
|
|
|
+ activityInfo.IsShowAppointment = services.IsShowAppointment(activityInfo.ActivityTypeId, activityInfo.ChartPermissionName)
|
|
|
|
+ }
|
|
resp.Detail = activityInfo
|
|
resp.Detail = activityInfo
|
|
}
|
|
}
|
|
resp.HasPermission = hasPermission
|
|
resp.HasPermission = hasPermission
|
|
@@ -2775,6 +2781,9 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
}
|
|
}
|
|
expertTxt, _ := services.GetReportContentTextSub(v.Expert)
|
|
expertTxt, _ := services.GetReportContentTextSub(v.Expert)
|
|
list[k].Expert = expertTxt
|
|
list[k].Expert = expertTxt
|
|
|
|
+ if v.IsHideAppointment == 0 {
|
|
|
|
+ list[k].IsShowAppointment = services.IsShowAppointment(v.ActivityTypeId, v.ChartPermissionName)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
resp := new(models.GetCygxActivityListRep)
|
|
resp := new(models.GetCygxActivityListRep)
|