zhupei 3 lat temu
rodzic
commit
5f18c1821c

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

5224
                 if (model.F_State != 0)
5224
                 if (model.F_State != 0)
5225
                 {
5225
                 {
5226
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
5226
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
5227
-                    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 ");
5227
+                    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 ");
5228
                     if (modellist.Count<=0)
5228
                     if (modellist.Count<=0)
5229
                     {
5229
                     {
5230
                         //if (modellist.F_NextUser != ua.F_UserCode)
5230
                         //if (modellist.F_NextUser != ua.F_UserCode)

+ 6 - 2
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

1241
                                         {
1241
                                         {
1242
                                             sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
1242
                                             sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
1243
                                         }
1243
                                         }
1244
+                                        else
1245
+                                        {
1246
+                                            sql += $"and 1!=1";
1247
+                                        }
1244
                                     }
1248
                                     }
1245
                                     else
1249
                                     else
1246
                                     {
1250
                                     {
2367
         public string judgmentDept(int deptid)
2371
         public string judgmentDept(int deptid)
2368
         {
2372
         {
2369
             string deptcode = "";
2373
             string deptcode = "";
2370
-            string sql = " ";
2374
+            string sql = "";
2371
 
2375
 
2372
             if (CirculMarket(deptid, 11))
2376
             if (CirculMarket(deptid, 11))
2373
             {
2377
             {
8441
                 if (model.F_State != 0)
8445
                 if (model.F_State != 0)
8442
                 {
8446
                 {
8443
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
8447
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
8444
-                    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 ");
8448
+                    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 ");
8445
                     if (modellist.Count<=0)
8449
                     if (modellist.Count<=0)
8446
                     {
8450
                     {
8447
                         //if (modellist.F_NextUser != ua.F_UserCode)
8451
                         //if (modellist.F_NextUser != ua.F_UserCode)