minquan

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -444,11 +444,15 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                             {
                                 Model.T_RepositoryLog logModel = new BLL.T_RepositoryLog().GetModel(auditModel.F_AfterLogID.Value);
                                 Model.T_RepositoryInformation infoModel = infoBLL.GetModel(auditModel.F_RepositoryId.Value);
-                                infoModel.F_Title = logModel.F_Title;
-                                infoModel.F_CategoryId = logModel.F_IntExpand1;
-                                infoModel.F_Description = logModel.F_Description;
-                                infoModel.F_Content = logModel.F_Content;
-                                return infoBLL.Update(infoModel);
+                                if (logModel!=null && infoModel!=null )
+                                {
+                                    infoModel.F_Title = logModel.F_Title;
+                                    infoModel.F_CategoryId = logModel.F_IntExpand1;
+                                    infoModel.F_Description = logModel.F_Description;
+                                    infoModel.F_Content = logModel.F_Content;
+                                    return infoBLL.Update(infoModel);
+                                }
+                               
                             }
                             if (auditModel.F_Action == 3)
                             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TotalCallController.cs

@@ -158,7 +158,16 @@ namespace CallCenterApi.Interface.Controllers.report
                 string sql = "";
                 if (!string.IsNullOrEmpty(years))
                 {
-                    sql += $" and CONVERT(char(4),BeginTime,20) = '{years}' ";
+                    try
+                    {
+                        DateTime time = DateTime.Parse(years);
+                        sql += $" and CONVERT(char(4),BeginTime,20) = '{time.Year }' ";
+                    }
+                    catch
+                    {
+                        sql += $" and CONVERT(char(4),BeginTime,20) = '{years }' ";
+                    }
+                   
                 }
                 DataTable dtNew = new DataTable();
                 #region
@@ -184,7 +193,16 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 else
                 {
-                    dtNow = DateTime.Parse(years + "年");
+                    try
+                    {
+                        DateTime time = DateTime.Parse(years);
+                        dtNow = DateTime.Parse(time.Year + "年");
+                    }
+                    catch
+                    {
+                        dtNow = DateTime.Parse(years + "年");
+                    }
+                    
                 }
                 int monthcount = 0;
                 for (int i = 1; i <= 12; i++)
@@ -408,8 +426,18 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 if (!string.IsNullOrEmpty(years))
                 {
-                    sql += $" and CONVERT(char(4),BeginTime,20) = '{years}' ";
-                    dtNow = DateTime.Parse(years + "年");
+                    try
+                    {
+                        DateTime time = DateTime.Parse(years);
+                        sql += $" and CONVERT(char(4),BeginTime,20) = '{time.Year }' ";
+                        dtNow = DateTime.Parse(time.Year + "年");
+                    }
+                    catch
+                    {
+                        sql += $" and CONVERT(char(4),BeginTime,20) = '{years}' ";
+                        dtNow = DateTime.Parse(years + "年");
+                    }
+                   
                 }
                 else
                     dtNow = DateTime.Now;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -338,6 +338,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             };
             return ccc;
         }
+
         /// <summary>
         /// 获取坐席处理列表
         /// </summary>