zhupei 3 年 前
コミット
11038c3bb3

+ 4 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

3039
                             {
3039
                             {
3040
                                 flag = 3;//需要判断处理内线还是外线
3040
                                 flag = 3;//需要判断处理内线还是外线
3041
                             }
3041
                             }
3042
-                            else if (state > 0)
3042
+                            else if (state > 0 && state<=2)
3043
                             {
3043
                             {
3044
-                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
3044
+                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
3045
                             }
3045
                             }
3046
                         }
3046
                         }
3047
                         else if (itemnext.Count > 0)
3047
                         else if (itemnext.Count > 0)
3093
                                 {
3093
                                 {
3094
                                     flag = 3;//需要判断处理内线还是外线
3094
                                     flag = 3;//需要判断处理内线还是外线
3095
                                 }
3095
                                 }
3096
-                                else if (state > 0)
3096
+                                else if (state > 0 && state<=2)
3097
                                 {
3097
                                 {
3098
-                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
3098
+                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
3099
                                 }
3099
                                 }
3100
                             }
3100
                             }
3101
                             else if(itemnext.Count > 0)
3101
                             else if(itemnext.Count > 0)

+ 4 - 4
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

2566
                             {
2566
                             {
2567
                                 flag = 3;//需要判断处理内线还是外线
2567
                                 flag = 3;//需要判断处理内线还是外线
2568
                             } 
2568
                             } 
2569
-                            else if (state > 0)
2569
+                            else if (state > 0 & state<=2)
2570
                             {
2570
                             {
2571
-                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState==4 || t.F_WoState == 3).FirstOrDefault().F_Type;
2571
+                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState==4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
2572
                             }
2572
                             }
2573
                         }
2573
                         }
2574
                         else if (itemnext.Count > 0)
2574
                         else if (itemnext.Count > 0)
2620
                                 {
2620
                                 {
2621
                                     flag = 3;//需要判断处理内线还是外线
2621
                                     flag = 3;//需要判断处理内线还是外线
2622
                                 }
2622
                                 }
2623
-                                else if (state > 0)
2623
+                                else if (state > 0 && state<=2)
2624
                                 {
2624
                                 {
2625
-                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
2625
+                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault()?.F_Type??0;
2626
                                 }
2626
                                 }
2627
                             }
2627
                             }
2628
                             else if (itemnext.Count > 0)
2628
                             else if (itemnext.Count > 0)

+ 2 - 2
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

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