Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -1986,9 +1986,9 @@ namespace Myshipping.Application
                         RecursiveMethod(newflow, depth,model);
                     }
 
-                    if ((bool)result)
+                    if (!(bool)result)
                     {
-                        if (flow.TrueMethod==null)
+                        if (flow.FalseMethod==null)
                         {
                             return;
                         }

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -359,7 +359,10 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         // 如果装货港代码不为空，则根据装货港代码查询装货港与船代的映射关系
         if (!string.IsNullOrEmpty(input.PortLoadCode))
         {
-            List<string> forwarderCodeList = await _relaPortLoadForwarderRep.AsQueryable().Where(x => x.PortLoadCode == input.PortLoadCode).Select(x => x.ForwarderCode).ToListAsync();
+            List<string> forwarderCodeList = await _relaPortLoadForwarderRep.AsQueryable()
+                                                                            .Where(x => x.PortLoadCode == input.PortLoadCode)
+                                                                            .Select(x => x.ForwarderCode)
+                                                                            .ToListAsync();
             queryList = queryList.Where(x => forwarderCodeList.Contains(x.Code)).ToList();
         }