zhoufan лет назад: 4
Родитель
Сommit
657423cdac

+ 10 - 6
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

849
                     model.SendWay = "立即发送";
849
                     model.SendWay = "立即发送";
850
                 else
850
                 else
851
                     model.SendWay = "定时发送";
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
                 if (it.SendTime < DateTime.Now && it.IsSend==1)
854
                 if (it.SendTime < DateTime.Now && it.IsSend==1)
855
                   //  if (it.IsSend == 0)
855
                   //  if (it.IsSend == 0)
856
                     model.IsSend = "已发送";
856
                     model.IsSend = "已发送";
864
                     if (MID != null)
864
                     if (MID != null)
865
                     {
865
                     {
866
                         // model.MBDetail = MID.Name;
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
                 }
878
                 }
875
                 model.MID = it.MID;
879
                 model.MID = it.MID;
876
                 model.MName = it.MName;
880
                 model.MName = it.MName;
877
-                model.CreateDate = it.CreateDate.ToString ();
881
+                model.CreateDate = it.CreateDate?.ToString ()??"";
878
                 modellist.Add(model);
882
                 modellist.Add(model);
879
             }
883
             }
880
             return modellist;
884
             return modellist;