zhoufan 7 anos atrás
pai
commit
3a77835150

+ 10 - 5
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -116,17 +116,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
116 116
                 string strpagesize = RequestString.GetQueryString("pagesize");
117 117
                 int pagesize = 10;
118 118
 
119
-                if (userModel.rolecode != "XTGLY")
119
+                if (strcode.Trim() != "" && strcode != "undefined")
120 120
                 {
121
-                    sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
121
+                    sql += " and F_GroupCode = '" + strcode + "' ";
122 122
                 }
123 123
                 else
124 124
                 {
125
-                    if (strcode.Trim() != "" && strcode != "undefined")
125
+                    if (!string.IsNullOrEmpty(userModel.groupcode))
126 126
                     {
127
-                        sql += " and F_GroupCode = '" + strcode + "' ";
127
+                        sql += " and F_GroupCode = '" + userModel.groupcode + "' ";
128 128
                     }
129 129
                 }
130
+
130 131
                 if (type != 0)
131 132
                 {
132 133
                     sql += " and F_Type = '" + type + "' ";
@@ -143,7 +144,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
143 144
                 {
144 145
                     sql += " and isnull(F_DealState,0) = '" + dealstate + "' ";
145 146
                 }
146
-
147
+                if (strkey.Trim() != "" && strkey != "undefined")
148
+                {
149
+                    sql += " and F_Content like '%" + strkey + "%' ";
150
+                }
147 151
                 if (strworkid.Trim() != "" && strworkid != "undefined")
148 152
                 {
149 153
                     sql += " and F_WorkOrderId like '%" + strworkid.Trim() + "%' ";
@@ -668,6 +672,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
668 672
                     using (TransactionScope trans = new TransactionScope())
669 673
                     {
670 674
                         #region 保存工单
675
+                        modelT_Bus_WorkOrder.F_State = 1;
671 676
                         modelT_Bus_WorkOrder.F_DealType = 1;
672 677
                         modelT_Bus_WorkOrder.F_DealState = dealstate;
673 678
                         modelT_Bus_WorkOrder.F_DealFile = files;