orgseed

src/Hotline.Application/Handlers/CallCenter/FlowControl/QueueVisitorToGroupBusyNotificationHandler.cs

@@ -25,7 +25,6 @@ namespace Hotline.Application.Handlers.CallCenter.FlowControl
                     x.FromNo == notification.Visitor.From && x.CreationTime >= DateTime.Now.AddHours(-2), cancellationToken);
             if (model!=null)
             {
-                model.InQueueTime = DateTime.Now;
                 model.CallStatus = Share.Enums.CallCenter.ECallStatus.InQueue;
                 await _callRepository.UpdateAsync(model, cancellationToken);
                 var detail = new CallDetail()
@@ -41,9 +40,9 @@ namespace Hotline.Application.Handlers.CallCenter.FlowControl
                 };
                 await _callDetailRepository.AddAsync(detail,cancellationToken);
                 //处理队列记录
-                var list = _callCacheManager.GetCallQueueList().ToList();
-                list.Add(model);
-                _callCacheManager.AddOrUpdateCallCache(list);
+                //var list = _callCacheManager.GetCallQueueList().ToList();
+                //list.Add(model);
+                //_callCacheManager.AddOrUpdateCallCache(list);
             }
         }
     }

src/Hotline.Repository.SqlSugar/System/SystemOrganizeRepository.cs

@@ -27,42 +27,24 @@ namespace Hotline.Repository.SqlSugar.System
             return list;
         }
 
-        public async Task<string> GetNewOrgCode(string? parentId)
+        public async Task<string> GetNewOrgCode(string parentId)
         {
-            //有父级
-            if (!string.IsNullOrEmpty(parentId))
+            //查是否存在下级
+            var model = await Db.Queryable<SystemOrganize>()
+                .OrderByDescending(x => x.OrgCode)
+                .FirstAsync(x => x.ParentId == parentId);
+            //如果存在下级
+            if (model!=null)
             {
-                //查是否存在下级
-                var model = await Db.Queryable<SystemOrganize>()
-                    .OrderByDescending(x => x.OrgCode)
-                    .FirstAsync(x => x.ParentId == parentId);
-                //如果存在下级
-                if (model!=null)
-                {
-                    //return $"{int.Parse(model.OrgCode) +1:###}";
-                    return (int.Parse(model.OrgCode) + 1).ToString().PadLeft(3,'0');
-                }
-                //如果不存在下级
-                else
-                {
-                    var parentModel = await Db.Queryable<SystemOrganize>()
-                        .FirstAsync(x => x.Id == parentId);
-                    return parentModel.OrgCode + "001";
-                }
+                //return $"{int.Parse(model.OrgCode) +1:###}";
+                return (int.Parse(model.OrgCode) + 1).ToString().PadLeft(3,'0');
             }
-            //没有父级
+            //如果不存在下级
             else
             {
-                //查询最大数值
-                var model = await Db.Queryable<SystemOrganize>()
-                    .OrderByDescending(x => x.OrgCode)
-                    .FirstAsync(x => x.ParentId=="");
-                if (model!=null)
-                {
-                    //return $"{int.Parse(model.OrgCode) + 1:###}";
-                    return (int.Parse(model.OrgCode) + 1).ToString().PadLeft(3,'0');
-                }
-                return "001";
+                var parentModel = await Db.Queryable<SystemOrganize>()
+                    .FirstAsync(x => x.Id == parentId);
+                return parentModel.OrgCode + "001";
             }
         }
     }

src/Hotline/SeedData/OrgSeedData.cs

@@ -0,0 +1,25 @@
+using Hotline.Identity.Roles;
+using Hotline.Settings;
+using XF.Domain.Entities;
+
+namespace Hotline.SeedData
+{
+    public class OrgSeedData : ISeedData<SystemOrganize>
+    {
+        public static readonly string Id = "08dac6ae-3096-4156-828e-b34e9c1fb5da";
+        public static readonly string Code = "001";
+
+        public IEnumerable<SystemOrganize> HasData() =>
+        new[]
+        {
+            new SystemOrganize
+            {
+                Id = Id,
+                OrgName = "12345政务服务便民热线",
+                OrgCode = Code,
+                IsEnable = true,
+                CreationTime = DateTime.Now
+            }
+        };
+    }
+}