|
|
@@ -849,8 +849,8 @@ namespace CallCenterApi.Interface.Controllers
|
|
849
|
849
|
model.SendWay = "立即发送";
|
|
850
|
850
|
else
|
|
851
|
851
|
model.SendWay = "定时发送";
|
|
852
|
|
- model.DSSendTime = it.DSSendTime.ToString ();
|
|
853
|
|
- model.SendTime = it.SendTime.ToString();
|
|
|
852
|
+ model.DSSendTime = it.DSSendTime?.ToString ()??"";
|
|
|
853
|
+ model.SendTime = it.SendTime?.ToString() ?? "";
|
|
854
|
854
|
if (it.SendTime < DateTime.Now && it.IsSend==1)
|
|
855
|
855
|
// if (it.IsSend == 0)
|
|
856
|
856
|
model.IsSend = "已发送";
|
|
|
@@ -864,9 +864,13 @@ namespace CallCenterApi.Interface.Controllers
|
|
864
|
864
|
if (MID != null)
|
|
865
|
865
|
{
|
|
866
|
866
|
// model.MBDetail = MID.Name;
|
|
867
|
|
- var typeName = new BLL.T_Sys_DictionaryValue().GetModel(Convert.ToInt32(MID.Name));
|
|
868
|
|
- if (typeName != null)
|
|
869
|
|
- model.MBDetail = typeName.F_Name;
|
|
|
867
|
+ int t = 0;
|
|
|
868
|
+ if (Int32.TryParse(MID.Name, out t))
|
|
|
869
|
+ {
|
|
|
870
|
+ var typeName = new BLL.T_Sys_DictionaryValue().GetModel(Convert.ToInt32(MID.Name));
|
|
|
871
|
+ if (typeName != null)
|
|
|
872
|
+ model.MBDetail = typeName.F_Name;
|
|
|
873
|
+ }
|
|
870
|
874
|
}
|
|
871
|
875
|
|
|
872
|
876
|
|
|
|
@@ -874,7 +878,7 @@ namespace CallCenterApi.Interface.Controllers
|
|
874
|
878
|
}
|
|
875
|
879
|
model.MID = it.MID;
|
|
876
|
880
|
model.MName = it.MName;
|
|
877
|
|
- model.CreateDate = it.CreateDate.ToString ();
|
|
|
881
|
+ model.CreateDate = it.CreateDate?.ToString ()??"";
|
|
878
|
882
|
modellist.Add(model);
|
|
879
|
883
|
}
|
|
880
|
884
|
return modellist;
|