master

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -3039,9 +3039,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             {
                                 flag = 3;//需要判断处理内线还是外线
                             }
-                            else if (state > 0)
+                            else if (state > 0 && state<=2)
                             {
-                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
                             }
                         }
                         else if (itemnext.Count > 0)
@@ -3093,9 +3093,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     flag = 3;//需要判断处理内线还是外线
                                 }
-                                else if (state > 0)
+                                else if (state > 0 && state<=2)
                                 {
-                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
                                 }
                             }
                             else if(itemnext.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -2566,9 +2566,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 flag = 3;//需要判断处理内线还是外线
                             } 
-                            else if (state > 0)
+                            else if (state > 0 & state<=2)
                             {
-                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState==4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState==4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
                             }
                         }
                         else if (itemnext.Count > 0)
@@ -2620,9 +2620,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     flag = 3;//需要判断处理内线还是外线
                                 }
-                                else if (state > 0)
+                                else if (state > 0 && state<=2)
                                 {
-                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
                                 }
                             }
                             else if (itemnext.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,8 +17,8 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=xinlianxin;"/>
-  <!--<add name="ConnectionString" connectionString="Data Source=.;User ID=sa;pwd=sa123456;Initial Catalog=CallCenter_XinXiangXLX0712;" />-->
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=xinlianxin;"/>-->
+  <add name="ConnectionString" connectionString="Data Source=.;User ID=sa;pwd=sa123456;Initial Catalog=CallCenter_XinXiangXLX0722;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>