Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -327,6 +327,7 @@ namespace RMYY_CallCenter_Api
 
             dt.Columns.Add("Buttons", typeof(object));//操作按钮
 
+            // TODO：这个地方可以走一下Redis
             List<Model.T_Sys_GongDan> dglist = gdbll.GetModelList("");
 
             foreach (DataRow dr in dt.Rows)
@@ -351,34 +352,33 @@ namespace RMYY_CallCenter_Api
 
                 //展示延期按钮
                 //接单人在接单之后，如果该工单类型上设置的“可延期次数”大于0显示“延期”按钮；点击延期按钮进行验证是否超过设定的延期次数，超过提醒“已超过规定延迟次数”
+                int categoryType = 0;
+
                 switch (type)
                 {
                     case 3000:
-                        var gdmodel = dglist.Where(x => x.F_GDId == Convert.ToInt32(dr["F_WorkOrderCategory"].ToString())).FirstOrDefault();
-                        if (gdmodel.F_CanReplayCount > 0)
-                        {
-                            //增加延期按钮
-                            //allButtons.Add("");
-
-
-                        }
-                        
+                        categoryType= Convert.ToInt32(dr["F_WorkOrderCategory"].ToString());                      
 
                         break;
                     case 1000:
-                        var gdmodel2 = dglist.Where(x => x.F_GDId == Convert.ToInt32(dr["F_type2"].ToString())).FirstOrDefault();
-                        if (gdmodel2.F_CanReplayCount > 0)
-                        {
-                            //增加延期按钮
-                           // allButtons.Add("");
+                        categoryType = Convert.ToInt32(dr["F_type2"].ToString());
+                        break;
+                }
 
+                var gdmodel = dglist.Where(x => x.F_GDId ==categoryType).FirstOrDefault();
+                if (gdmodel==null
+                    || gdmodel.F_CanReplayCount == 0)
+                {
+                    //移除延期按钮                   
+                    var hasButton = allButtons.Where(p => p.value == "延期").FirstOrDefault();
+
+                    allButtons.Remove(hasButton);
 
-                        }
-                        break;
 
 
                 }
 
+
                 dr["Buttons"] = allButtons;
                 #endregion