提交分支

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -5224,7 +5224,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (model.F_State != 0)
                 {
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
-                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ");
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ");
                     if (modellist.Count<=0)
                     {
                         //if (modellist.F_NextUser != ua.F_UserCode)

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

@@ -1241,6 +1241,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         {
                                             sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
                                         }
+                                        else
+                                        {
+                                            sql += $"and 1!=1";
+                                        }
                                     }
                                     else
                                     {
@@ -2367,7 +2371,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string judgmentDept(int deptid)
         {
             string deptcode = "";
-            string sql = " ";
+            string sql = "";
 
             if (CirculMarket(deptid, 11))
             {
@@ -8441,7 +8445,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (model.F_State != 0)
                 {
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
-                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ");
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ");
                     if (modellist.Count<=0)
                     {
                         //if (modellist.F_NextUser != ua.F_UserCode)