电商

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

@@ -155,6 +155,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0,ZX=0;
                 string where = $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+               if (ro.F_RoleCode == "DS")//电商角色
+                {
+                    where += "and F_Content like  '%电商%'";
+                }
                 for (int i=0;i<12;i ++)
                 {
                     switch (i )
@@ -405,7 +409,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (CJ == 1)
                 {
                     sql += $" and (F_Type=" + 4 + "or (F_Duplicate in(4)and F_Type=3))";
-                    if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                    if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                     {
                         sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                     }
@@ -658,6 +662,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += "AND F_CreateUser='"+ua .F_UserCode +"'";
                     }
                 }
+                if (ro.F_RoleCode == "DS")//电商角色
+                {
+                    sql += "and F_Content like  '%电商%'";
+                }
                 if (isdc >0)
                 {
                    

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net45" />
   <package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.2.0" targetFramework="net45" />

codegit/CallCenterCommon/CallCenter.QuartzService/CallCenter.QuartzService.csproj

@@ -42,9 +42,8 @@
       <HintPath>..\..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -96,7 +95,9 @@
     <None Include="job_scheduling_data_2_0.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="bin\Debug\Uninstall.bat" />
   </ItemGroup>
   <ItemGroup>

codegit/CallCenterCommon/CallCenter.QuartzService/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Common.Logging" version="3.3.1" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net45" />
-  <package id="log4net" version="2.0.8" targetFramework="net45" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Quartz" version="2.5.0" targetFramework="net45" />
 </packages>