排序，时间

CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -173,34 +173,8 @@ 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());
-                    }
-                }
-
-                return ds;
-            }
-            else
-            {
-                return dal.GetList(strWhere, filedOrder);
-            }
-          //  return dal.GetList(strWhere, filedOrder);
+            return dal.GetList(strWhere, filedOrder);
+            //  return dal.GetList(strWhere, filedOrder);
         }
 
         /// <summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -158,9 +158,9 @@ namespace CallCenterApi.Interface.Controllers
             {
                 try
                 {
-                    var t = PushAppSend(Title, count, clientid);
                     msg.AddInternalMessagesInfo(Title, count,
-                        usercode, "8000", (int)EnumSmsType.workorder,0, workOrderId);
+                      usercode, "8000", (int)EnumSmsType.workorder, 0, workOrderId);
+                    var t = PushAppSend(Title, count, clientid);
                 }
                catch(Exception e)
                 {

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

@@ -130,7 +130,7 @@ namespace CallCenterApi.Interface.Controllers
                                             "F_UserId",
                                             "*",
                                             sql,
-                                            "ORDER BY F_UserId desc",
+                                            "ORDER BY CONVERT(int ,F_UserCode ) asc",
                                             pagesize,
                                             pageindex,
                                             true,
@@ -484,14 +484,14 @@ namespace CallCenterApi.Interface.Controllers
             }
 
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
-            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ").Tables[0];
+            var userList = sysUserAccountBll.GetList(sql, "CONVERT(int ,F_UserCode ) asc ").Tables[0];
             return Success("列表加载成功", userList);
         }
 
         //根据部门获取用户
         public ActionResult GetDeptUserList(int deptid = 0)
         {
-            var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " f_userid desc ");
+            var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " CONVERT(int ,F_UserCode ) asc");
             return Success("列表加载成功", DeptUserList);
 
         }

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

@@ -879,22 +879,30 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         buttons.Add(feedback());
                       
-                        if (InfoSource == "2580")
-                            buttons.Add(ejdelay());
-                        else
-                            buttons.Add(delay());
+                        if (ispd !="3")
+                        {
+                            if (InfoSource == "2580")
+                                buttons.Add(ejdelay());
+                            else
+                                buttons.Add(delay());
+                        }
+                       
                         if (ispd == "0" || ispd == "")
                         {
                             buttons.Add(split());
                         }
                         else
                         {
-                            buttons.Add(withdraw());
+                            if (ispd == "3")
+                                buttons.Add(redo ());
+                            else
+                                buttons.Add(withdraw ());
                         }
                         if (ispd == "3")
                         {
                             buttons.Add(auditdeal());
                         }
+                      
 
                         
                     }
@@ -979,14 +987,23 @@ namespace CallCenterApi.Interface.Models.Common
                     {
 
                         buttons.Add(feedback());
-                        buttons.Add(delay());
+                        if (ispd != "3")
+                        {
+                            if (InfoSource == "2580")
+                                buttons.Add(ejdelay());
+                            else
+                                buttons.Add(delay());
+                        }
                         if (ispd == "0" || ispd == "")
                         {
                             buttons.Add(split());
                         }
                         else
                         {
-                            buttons.Add(withdraw());
+                            if (ispd == "3")
+                                buttons.Add(redo());
+                            else
+                                buttons.Add(withdraw());
                         }
                         if (ispd == "3")
                         {