REDIS

CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -30,6 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <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>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -186,6 +189,9 @@
       <Name>CallCenterApi.Model</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

CallCenterApi/CallCenterApi.BLL/T_Sys_Area.cs

@@ -113,7 +113,7 @@ namespace CallCenterApi.BLL
 		/// </summary>
 		public DataSet GetList(string strWhere, string filedOrder="")
 		{
-            var dt = GetRedis();
+           var dt = GetRedis();
             if (dt != null)
             {
                 var ds = new DataSet();

CallCenterApi/CallCenterApi.BLL/T_Sys_DictionaryValue.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 
 using CallCenterApi.Model;
 using CallCenter.Utility;
+using Newtonsoft.Json;
 
 namespace CallCenterApi.BLL
 {
@@ -70,23 +71,24 @@ namespace CallCenterApi.BLL
         /// </summary>
         public CallCenterApi.Model.T_Sys_DictionaryValue GetModel(int F_ValueId)
 		{
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var dr = dt.Select("F_ValueId=" + F_ValueId);
-                if (dr != null && dr.Length > 0)
-                {
-                    return dal.DataRowToModel(dr[0]);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                return dal.GetModel(F_ValueId);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var dr = dt.Select("F_ValueId=" + F_ValueId);
+            //    if (dr != null && dr.Length > 0)
+            //    {
+            //        return dal.DataRowToModel(dr[0]);
+            //    }
+            //    else
+            //    {
+            //        return null;
+            //    }
+            //}
+            //else
+            //{
+            //    return dal.GetModel(F_ValueId);
+            //}
+            return dal.GetModel(F_ValueId);
         }
 
         /// <summary>
@@ -118,27 +120,27 @@ namespace CallCenterApi.BLL
         /// </summary>
         public DataSet GetList(string strWhere, string filedOrder = "")
         {
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var ds = new DataSet();
-
-                var drs = dt.Select(strWhere, filedOrder);
-                if (drs.Length > 0)
-                {
-                    ds.Tables.Add(drs.CopyToDataTable());
-                }
-                else
-                {
-                    ds.Tables.Add(new DataTable());
-                }
-                return ds;
-            }
-            else
-            {
-                return dal.GetList(strWhere);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var ds = new DataSet();
 
+            //    var drs = dt.Select(strWhere, filedOrder);
+            //    if (drs.Length > 0)
+            //    {
+            //        ds.Tables.Add(drs.CopyToDataTable());
+            //    }
+            //    else
+            //    {
+            //        ds.Tables.Add(new DataTable());
+            //    }
+            //    return ds;
+            //}
+            //else
+            //{
+            //    return dal.GetList(strWhere);
+            //}
+            return dal.GetList(strWhere);
         }
 
         /// <summary>
@@ -160,22 +162,24 @@ namespace CallCenterApi.BLL
 		/// </summary>
 		public List<CallCenterApi.Model.T_Sys_DictionaryValue> GetModelList(string strWhere, string filedOrder = "")
 		{
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var dtnew = new DataTable();
-                var drs = dt.Select(strWhere, filedOrder);
-                if (drs.Length > 0)
-                {
-                    dtnew = drs.CopyToDataTable();
-                }
-                return DataTableToList(dtnew);
-            }
-            else
-            {
-                DataSet ds = dal.GetList(strWhere, filedOrder);
-                return DataTableToList(ds.Tables[0]);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var dtnew = new DataTable();
+            //    var drs = dt.Select(strWhere, filedOrder);
+            //    if (drs.Length > 0)
+            //    {
+            //        dtnew = drs.CopyToDataTable();
+            //    }
+            //    return DataTableToList(dtnew);
+            //}
+            //else
+            //{
+            //    DataSet ds = dal.GetList(strWhere, filedOrder);
+            //    return DataTableToList(ds.Tables[0]);
+            //}
+            DataSet ds = dal.GetList(strWhere, filedOrder);
+            return DataTableToList(ds.Tables[0]);
         }
 
         /// <summary>
@@ -270,8 +274,7 @@ namespace CallCenterApi.BLL
         private DataTable InRedis()
         {
             var dt = dal.GetList("").Tables[0];
-
-            RedisHelper1.StringSet("T_Sys_DictionaryValue", dt.ToJson(), new TimeSpan(24, 0, 0));
+            RedisHelper1.StringSet("T_Sys_DictionaryValue", dt.ToJson (), new TimeSpan(24, 0, 0));
 
             return dt;
         }

CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -83,23 +83,24 @@ namespace CallCenterApi.BLL
         public Model.T_Sys_UserAccount GetModel(int F_UserId)
         {
 
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var dr = dt.Select("F_UserId=" + F_UserId);
-                if (dr != null && dr.Count() > 0)
-                {
-                    return dal.DataRowToModel(dr[0]);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                return dal.GetModel(F_UserId);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var dr = dt.Select("F_UserId=" + F_UserId);
+            //    if (dr != null && dr.Count() > 0)
+            //    {
+            //        return dal.DataRowToModel(dr[0]);
+            //    }
+            //    else
+            //    {
+            //        return null;
+            //    }
+            //}
+            //else
+            //{
+            //    return dal.GetModel(F_UserId);
+            //}
+            return dal.GetModel(F_UserId);
         }
         /// <summary>
         /// 得到一个对象实体
@@ -107,23 +108,24 @@ namespace CallCenterApi.BLL
         public Model.T_Sys_UserAccount GetModel(string F_UserCode)
         {
 
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var dr = dt.Select("F_UserCode='" + F_UserCode+"'");
-                if (dr != null&& dr.Count()>0)
-                {
-                    return dal.DataRowToModel(dr[0]);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                return dal.GetModel(F_UserCode);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var dr = dt.Select("F_UserCode='" + F_UserCode+"'");
+            //    if (dr != null&& dr.Count()>0)
+            //    {
+            //        return dal.DataRowToModel(dr[0]);
+            //    }
+            //    else
+            //    {
+            //        return null;
+            //    }
+            //}
+            //else
+            //{
+            //    return dal.GetModel(F_UserCode);
+            //}
+            return dal.GetModel(F_UserCode);
         }
         /// <summary>
         /// 得到一个对象实体
@@ -171,33 +173,34 @@ namespace CallCenterApi.BLL
         /// </summary>
         public DataSet GetList(string strWhere, string filedOrder = "")
         {
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var ds = new DataSet();
-                if (string.IsNullOrEmpty(strWhere))
-                {
-                    ds.Tables.Add(dt.Copy());
-                }
-                else
-                {
-                    var drs = dt.Select(strWhere, filedOrder);
-                    if (drs.Length > 0)
-                    {
-                        ds.Tables.Add(drs.CopyToDataTable());
-                    }
-                    else
-                    {
-                        ds.Tables.Add(new DataTable());
-                    }
-                }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var ds = new DataSet();
+            //    if (string.IsNullOrEmpty(strWhere))
+            //    {
+            //        ds.Tables.Add(dt.Copy());
+            //    }
+            //    else
+            //    {
+            //        var drs = dt.Select(strWhere, filedOrder);
+            //        if (drs.Length > 0)
+            //        {
+            //            ds.Tables.Add(drs.CopyToDataTable());
+            //        }
+            //        else
+            //        {
+            //            ds.Tables.Add(new DataTable());
+            //        }
+            //    }
 
-                return ds;
-            }
-            else
-            {
-                return dal.GetList(strWhere, filedOrder);
-            }
+            //    return ds;
+            //}
+            //else
+            //{
+            //    return dal.GetList(strWhere, filedOrder);
+            //}
+            return dal.GetList(strWhere, filedOrder);
         }
 
         /// <summary>
@@ -232,22 +235,24 @@ namespace CallCenterApi.BLL
         /// </summary>
         public List<Model.T_Sys_UserAccount> GetModelList(string strWhere, string filedOrder = "")
         {
-            var dt = GetRedis();
-            if (dt != null)
-            {
-                var dtnew = new DataTable();
-                var drs = dt.Select(strWhere, filedOrder);
-                if (drs.Length > 0)
-                {
-                    dtnew = drs.CopyToDataTable();
-                }
-                return DataTableToList(dtnew);
-            }
-            else
-            {
-                DataSet ds = dal.GetList(strWhere, filedOrder);
-                return DataTableToList(ds.Tables[0]);
-            }
+            //var dt = GetRedis();
+            //if (dt != null)
+            //{
+            //    var dtnew = new DataTable();
+            //    var drs = dt.Select(strWhere, filedOrder);
+            //    if (drs.Length > 0)
+            //    {
+            //        dtnew = drs.CopyToDataTable();
+            //    }
+            //    return DataTableToList(dtnew);
+            //}
+            //else
+            //{
+            //    DataSet ds = dal.GetList(strWhere, filedOrder);
+            //    return DataTableToList(ds.Tables[0]);
+            //}
+            DataSet ds = dal.GetList(strWhere, filedOrder);
+            return DataTableToList(ds.Tables[0]);
         }
 
         /// <summary>

CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -182,6 +182,9 @@
       <Name>CallCenterApi.Model</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="log4net.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

CallCenterApi/CallCenterApi.DAL/log4net.config

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+  </configSections>
+
+  <log4net>
+    <!--根配置-->
+    <root>
+      <!--日志级别:可选值: ERROR > WARN > INFO > DEBUG -->
+      <level value="ERROR"/>
+      <level value="WARN"/>
+      <level value="INFO"/>
+      <level value="DEBUG"/>
+      <appender-ref ref="ErrorLog" />
+      <appender-ref ref="WarnLog" />
+      <appender-ref ref="InfoLog" />
+      <appender-ref ref="DebugLog" />
+    </root>
+    <!-- 错误 Error.log-->
+    <appender name="ErrorLog" type="log4net.Appender.RollingFileAppender">
+      <!--目录路径，可以是相对路径或绝对路径-->
+      <param name="File" value="D:\CallCenter_log"/>
+      <!--文件名，按日期生成文件夹-->
+      <param name="DatePattern" value="/yyyy-MM-dd/&quot;Error.log&quot;"/>
+      <!--追加到文件-->
+      <appendToFile value="true"/>
+      <!--创建日志文件的方式，可选值：Date[日期],文件大小[Size],混合[Composite]-->
+      <rollingStyle value="Composite"/>
+      <!--写到一个文件-->
+      <staticLogFileName value="false"/>
+      <!--单个文件大小。单位:KB|MB|GB-->
+      <maximumFileSize value="20MB"/>
+      <!--最多保留的文件数，设为"-1"则不限-->
+      <maxSizeRollBackups value="-1"/>
+      <!--日志格式-->
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="记录时间：[%date] %thread -- %-5level -- %logger [%M] %n%message%n%n"/>
+      </layout>
+      <filter type="log4net.Filter.LevelRangeFilter">
+        <param name="LevelMin" value="ERROR" />
+        <param name="LevelMax" value="ERROR" />
+      </filter>
+    </appender>
+
+    <!-- 警告 Warn.log-->
+    <appender name="WarnLog" type="log4net.Appender.RollingFileAppender">
+      <!--目录路径，可以是相对路径或绝对路径-->
+      <param name="File" value="D:\CallCenter_log"/>
+      <!--文件名，按日期生成文件夹-->
+      <param name="DatePattern" value="/yyyy-MM-dd/&quot;Warn.log&quot;"/>
+      <!--追加到文件-->
+      <appendToFile value="true"/>
+      <!--创建日志文件的方式，可选值：Date[日期],文件大小[Size],混合[Composite]-->
+      <rollingStyle value="Composite"/>
+      <!--写到一个文件-->
+      <staticLogFileName value="false"/>
+      <!--单个文件大小。单位:KB|MB|GB-->
+      <maximumFileSize value="20MB"/>
+      <!--最多保留的文件数，设为"-1"则不限-->
+      <maxSizeRollBackups value="-1"/>
+      <!--日志格式-->
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="记录时间：[%date] %thread -- %-5level -- %logger [%M] %n%message%n%n"/>
+      </layout>
+      <filter type="log4net.Filter.LevelRangeFilter">
+        <param name="LevelMin" value="WARN" />
+        <param name="LevelMax" value="WARN" />
+      </filter>
+    </appender>
+
+    <!-- 信息 Info.log-->
+    <appender name="InfoLog" type="log4net.Appender.RollingFileAppender">
+      <!--目录路径，可以是相对路径或绝对路径-->
+      <param name="File" value="D:\CallCenter_log"/>
+      <!--文件名，按日期生成文件夹-->
+      <param name="DatePattern" value="/yyyy-MM-dd/&quot;Info.log&quot;"/>
+      <!--追加到文件-->
+      <appendToFile value="true"/>
+      <!--创建日志文件的方式，可选值：Date[日期],文件大小[Size],混合[Composite]-->
+      <rollingStyle value="Composite"/>
+      <!--写到一个文件-->
+      <staticLogFileName value="false"/>
+      <!--单个文件大小。单位:KB|MB|GB-->
+      <maximumFileSize value="20MB"/>
+      <!--最多保留的文件数，设为"-1"则不限-->
+      <maxSizeRollBackups value="-1"/>
+      <!--日志格式-->
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="记录时间：[%date] %thread -- %-5level -- %logger [%M] %n%message%n%n"/>
+      </layout>
+      <filter type="log4net.Filter.LevelRangeFilter">
+        <param name="LevelMin" value="INFO" />
+        <param name="LevelMax" value="INFO" />
+      </filter>
+    </appender>
+
+    <!-- 调试 Debug.log-->
+    <appender name="DebugLog" type="log4net.Appender.RollingFileAppender">
+      <!--目录路径，可以是相对路径或绝对路径-->
+      <param name="File" value="D:\CallCenter_log"/>
+      <!--文件名，按日期生成文件夹-->
+      <param name="DatePattern" value="/yyyy-MM-dd/&quot;Debug.log&quot;"/>
+      <!--追加到文件-->
+      <appendToFile value="true"/>
+      <!--创建日志文件的方式，可选值：Date[日期],文件大小[Size],混合[Composite]-->
+      <rollingStyle value="Composite"/>
+      <!--写到一个文件-->
+      <staticLogFileName value="false"/>
+      <!--单个文件大小。单位:KB|MB|GB-->
+      <maximumFileSize value="20MB"/>
+      <!--最多保留的文件数，设为"-1"则不限-->
+      <maxSizeRollBackups value="-1"/>
+      <!--日志格式-->
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="记录时间：[%date] %thread -- %-5level -- %logger [%M] %n%message%n%n"/>
+      </layout>
+      <filter type="log4net.Filter.LevelRangeFilter">
+        <param name="LevelMin" value="DEBUG" />
+        <param name="LevelMax" value="DEBUG" />
+      </filter>
+    </appender>
+
+
+  </log4net>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+</configuration>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -31,15 +31,15 @@ namespace CallCenterApi.Interface.Controllers
                 pid = "0";
                 sql += " and F_PrentId=0   ";
             }
-            if (pid == "0")
-            {
-                var strList = RedisHelper1.StringGet("ZTreeList_0");
-                if (strList != null)
-                {
-                    return Success("加载成功",strList.ToString().ToObject<List<Model.TreeModel>>());
-                }
+            //if (pid == "0")
+            //{
+            //    var strList = RedisHelper1.StringGet("ZTreeList_0");
+            //    if (strList != null)
+            //    {
+            //        return Success("加载成功",strList.ToString().ToObject<List<Model.TreeModel>>());
+            //    }
               
-            }
+            //}
           
 
             dt = new BLL.T_Sys_DictionaryValue().GetList(" 1=1 " + sql).Tables[0];
@@ -57,7 +57,7 @@ namespace CallCenterApi.Interface.Controllers
             List<Model.TreeModel> modelList = BindTree(dt, "0", tab2);
             if (pid == "0")
             {
-                RedisHelper1.StringSet("ZTreeList_0", modelList.ToJson());
+              //  RedisHelper1.StringSet("ZTreeList_0", modelList.ToJson());
             }
             if (modelList.Count > 0)
             {
@@ -81,14 +81,14 @@ namespace CallCenterApi.Interface.Controllers
                 pid = "0";
                 sql += " and F_PrentId=0   ";
             }
-            if (pid=="38")
-            {
-                string rjson = RedisHelper1.StringGet("ztree_38new")?.ToString() ?? "";
-                if (!string.IsNullOrEmpty(rjson))
-                {
-                    return Success("加载成功", rjson);
-                }
-            }
+            //if (pid=="38")
+            //{
+            //    string rjson = RedisHelper1.StringGet("ztree_38new")?.ToString() ?? "";
+            //    if (!string.IsNullOrEmpty(rjson))
+            //    {
+            //        return Success("加载成功", rjson);
+            //    }
+            //}
            
 
             dt = new BLL.T_Sys_DictionaryValue().GetList(" 1=1 " + sql).Tables[0];
@@ -100,7 +100,7 @@ namespace CallCenterApi.Interface.Controllers
             List<TreeModelNew> modelList = BindTreeNew(dt, "0", tab2);
             if (pid == "38")
             {
-                RedisHelper1.StringSet("ztree_38new", modelList.ToJson());
+              //  RedisHelper1.StringSet("ztree_38new", modelList.ToJson());
             }
             if (modelList.Count > 0)
             {
@@ -228,15 +228,15 @@ namespace CallCenterApi.Interface.Controllers
         {
             DataTable dt = new DataTable();
             string pid = HttpUtility.UrlDecode(RequestString.GetQueryString("pid"));
-            if (pid == "38")
-            {
-                string rjson = RedisHelper1.StringGet("ztree_38")?.ToString()??"";
-                if (!string.IsNullOrEmpty(rjson))
-                {
-                    return Success("加载成功", rjson.ToObject<DataTable>());
-                }
-
-            }
+            //if (pid == "38")
+            //{
+            //    string rjson = RedisHelper1.StringGet("ztree_38")?.ToString()??"";
+            //    if (!string.IsNullOrEmpty(rjson))
+            //    {
+            //        return Success("加载成功", rjson.ToObject<DataTable>());
+            //    }
+
+            //}
             string sql = " and F_State=0 ";
             if (pid.Trim() != "")
             {
@@ -255,7 +255,7 @@ namespace CallCenterApi.Interface.Controllers
 
             if (pid == "38")
             {
-                RedisHelper1.StringSet("ztree_38", tab2.ToJson());
+               // RedisHelper1.StringSet("ztree_38", tab2.ToJson());
             }
 
             return Success("加载成功", tab2);
@@ -265,28 +265,28 @@ namespace CallCenterApi.Interface.Controllers
         {
             DataTable dt = new DataTable();
 
-            string rjson = RedisHelper1.StringGet("key_38")?.ToString() ?? "";
-            if (!string.IsNullOrEmpty(rjson))
-            {
-                dt = rjson.ToObject<DataTable>();
-                var dtnew = new DataTable();
-                if (string.IsNullOrEmpty(key))
-                {
-                    dtnew = dt;
-                }
-                else
-                {
-                    var drs = dt.Select(" name like '%" + key + "%'","names");
-                    if (drs.Length > 0)
-                    {
-                        dtnew = drs.CopyToDataTable();
-                    }
-                }
-                return Success("加载成功", dtnew);
-            }
+            //string rjson = RedisHelper1.StringGet("key_38")?.ToString() ?? "";
+            //if (!string.IsNullOrEmpty(rjson))
+            //{
+            //    dt = rjson.ToObject<DataTable>();
+            //    var dtnew = new DataTable();
+            //    if (string.IsNullOrEmpty(key))
+            //    {
+            //        dtnew = dt;
+            //    }
+            //    else
+            //    {
+            //        var drs = dt.Select(" name like '%" + key + "%'","names");
+            //        if (drs.Length > 0)
+            //        {
+            //            dtnew = drs.CopyToDataTable();
+            //        }
+            //    }
+            //    return Success("加载成功", dtnew);
+            //}
 
             var tab2 = DbHelperSQL.Query("select * from View_Keys").Tables[0];
-            RedisHelper1.StringSet("key_38", tab2.ToJson());
+           // RedisHelper1.StringSet("key_38", tab2.ToJson());
 
             string sql = "";
             if (string.IsNullOrEmpty(key))

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -452,15 +452,15 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetSeatList()
         {
             //List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 ");
-            var drs = sysUserAccountBll.GetList("").Tables[0].Select("f_seatflag=1");
+            var drs = sysUserAccountBll.GetModelList ("f_seatflag=1");
             var userSeartList = from r in drs select new {
-                F_UserId = r["F_UserId"].ToString(),
-                F_UserName = r["F_UserName"].ToString(),
-                F_UserCode = r["F_UserCode"].ToString()
+                F_UserId =r .F_UserId ,
+                F_UserName = r.F_UserName,
+                F_UserCode = r.F_UserCode
             };
-            var result = userSeartList.OrderBy(p => p.F_UserName.Substring(p.F_UserName.Length - 1)).ToList();
+           // var result = userSeartList.OrderBy(p => p.F_UserName.Substring(p.F_UserName.Length - 1)).ToList();
 
-            return Success("列表加载成功", result);
+            return Success("列表加载成功", userSeartList);
         }
         //根据角色获取用户
         public ActionResult GetUsersList(string rolecode)

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

@@ -8626,11 +8626,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                        
                         var bldt = DbHelperSQL.Query(blsql).Tables[0];
-
-                        if (User.F_RoleCode == "WLDW" && bldt.Rows[0]["F_MainDeptId"].ToString() != User.F_DeptId.ToString())
+                        if (bldt != null && bldt.Rows.Count > 0)
                         {
-                            bldt.Rows[0]["F_Result"] = "";
+                            if (User.F_RoleCode == "WLDW" && bldt.Rows[0]["F_CreateDeptId"].ToString() != User.F_DeptId.ToString())
+                            {
+
+                                bldt.Rows[0]["F_Result"] = "";
+                            }
                         }
+                           
                         if (configfj != null)
                         {
                             bldt = BindFileDatas(bldt, configfj.F_ParamValue);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -314,7 +314,7 @@ namespace CallCenterApi.Interface.Models.Common
                     if (code == "ZJZY")
                         buttons.Add(edit());
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
+                    if (code == "ZXLD" || code == "YSZY" || code == "GLY" || code == "ZXLDGLYGLY" || code == "DDZG" || code == "MTDD")
                     {
                         if (issh ==2 && code == "MTDD")
                         {
@@ -362,7 +362,7 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "4":
                     //二级网络单位 管理员
-                    if (code == "WLDW" || code == "GLY" || code == "DDZG")
+                    if (code == "WLDW" || code == "DDZG")
                     {
                         buttons.Add(feedback());// buttons.Add(reback());
                         if (iszbdw == "1" || code == "GLY" || code == "DDZG")
@@ -714,6 +714,7 @@ namespace CallCenterApi.Interface.Models.Common
             //调度专员 中心领导管理员 管理员
             if (state != "0" && state != "9" && (code == "ZXLD" || code == "YSZY" || code == "MTDD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"))
             {
+               
                 buttons.Add(forceend());
             }
             return buttons;