From 930c9fba1aa30d088570378d19e2bc21c5c36489 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 4 Jul 2024 18:27:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=87=BA=E5=B7=AE?=
 =?UTF-8?q?=E7=BB=84=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Jobs/CreateDefinitelyGroupJob.cs          | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
index 6c47d56c..fb350d69 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/CreateDefinitelyGroupJob.cs
@@ -115,13 +115,13 @@ public class CreateDefinitelyGroupJob : BaseJob
                 foreach (var factory in tenants.Where(x => x.PCode == workplace.Code))
                 {
                     var factoryName = $"*{type.GetDescription()}厂区系统组({factory.Name})";
-                    if (!await DbContext.Queryable<DeviceGroupEntity>().Where(x => x.PCode == workplaceGrp.Code).AnyAsync(x => x.Name == factoryName))
+                    var factoryGrp = await DbContext.Queryable<DeviceGroupEntity>().Where(x => x.PCode == workplaceGrp.Code).FirstAsync(x => x.Name == factoryName);
+                    if (factoryGrp == null)
                     {
-                        var currentCode = Guid.NewGuid();
-                        await DbContext.InsertAsync(new DeviceGroupEntity
+                        factoryGrp = new DeviceGroupEntity
                         {
                             PCode = workplaceGrp.Code,
-                            Code = currentCode,
+                            Code = Guid.NewGuid(),
                             Type = type,
                             Name = factoryName,
                             Editable = false,
@@ -129,21 +129,26 @@ public class CreateDefinitelyGroupJob : BaseJob
                             Remark = _remark,
 
                             TenantId = factory.Code,
-                        });
+                        };
+                        await DbContext.InsertAsync(factoryGrp);
+                    }
 
-                        if (type == DeviceTypeEnumType.Door)
+                    if (type == DeviceTypeEnumType.Door)
+                    {
+                        if (!await DbContext.Queryable<DeviceGroupEntity>().Where(x => x.PCode == factoryGrp.Code).AnyAsync(x => x.IsBusinessTrip))
                         {
                             await DbContext.InsertAsync(new DeviceGroupEntity
                             {
-                                PCode = currentCode,
-                                Code = currentCode,
+                                PCode = factoryGrp.Code,
+                                Code = Guid.NewGuid(),
                                 Type = type,
-                                Name = "出差组",
+                                Name = "*出差组",
                                 Editable = false,
                                 AbleSetNext = false,
-                                Remark = _remark,
                                 IsBusinessTrip = true,
-                                TenantId = factory.Code
+                                Remark = _remark,
+
+                                TenantId = factory.Code,
                             });
                         }
                     }