From 9728c5f24fb8984511952d2f74c68c7b3ad058d0 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 5 Aug 2024 16:49:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/FactorySettingResponse.cs        |  2 ++
 .../Implements/FactorySettingService.cs       |  8 ++++---
 .../Services/Implements/GainfoGroupService.cs | 23 ++++---------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Response/FactorySettingResponse.cs b/Src/Dlhis.Basic/Organization/Response/FactorySettingResponse.cs
index fe69447b..f60f17be 100644
--- a/Src/Dlhis.Basic/Organization/Response/FactorySettingResponse.cs
+++ b/Src/Dlhis.Basic/Organization/Response/FactorySettingResponse.cs
@@ -4,6 +4,8 @@ public class FactorySettingResponse
 {
     public string Factory { get; set; }
 
+    public string FactoryName { get; set; }
+
     /// <summary>
     /// 是否启用外包自动下发
     /// </summary>
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs
index 76d4aca5..e4bf8180 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/FactorySettingService.cs
@@ -29,11 +29,13 @@ public class FactorySettingService : IFactorySettingService
 
         return factories.Select(item =>
         {
+            var factory = factories.FirstOrDefault(x => x.Code == item.Code);
             return new FactorySettingResponse
             {
-                Factory = factories.FirstOrDefault(x => x.Code == item.Code)?.Name,
+                Factory = factory?.Code,
+                FactoryName = factory?.Name,
                 EnableOutsourceDown = settings.FirstOrDefault(x => x.TenantId == item.Code)?.EnableOutsourceDown ?? false,
-                UserQrCodeExpiration = settings.FirstOrDefault(x => x.TenantId == item.Code)?.UserQrCodeExpiration,
+                UserQrCodeExpiration = settings.FirstOrDefault(x => x.TenantId == item.Code)?.UserQrCodeExpiration
             };
         }).ToList();
     }
@@ -52,7 +54,7 @@ public class FactorySettingService : IFactorySettingService
         {
             request.Adapt(setting);
             setting.TenantId = request.Factory;
-            
+
             await _dbContext.UpdateAsync(setting);
         }
     }
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
index 37f1cdf8..d6429595 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
@@ -3,7 +3,6 @@ using Dlhis.Basic.Organization.Request;
 using Dlhis.Basic.Organization.Response;
 using Dlhis.Entity.Basic.Entity;
 using Kurisu.AspNetCore.Authentication.Abstractions;
-using Kurisu.AspNetCore.DataAccess.Entity;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Mapster;
@@ -38,25 +37,13 @@ public class GainfoGroupService : IGainfoGroupService
     public async Task SaveAsync(GainfoGroupSaveRequest request)
     {
         await CheckDuplicateNameAsync(request);
-        try
-        {
-            //todo 
-            _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
-            var defaultGroup = await _dbContext.Queryable<GainfoGroupEntity>().Where(x => x.IsDefault).FirstAsync();
-
-            if (!request.PCode.HasValue)
-            {
-                request.PCode = defaultGroup.Code;
-            }
-        }
-        finally
-        {
-            _dbContext.Client.QueryFilter.Restore();
-        }
-
-
         if (!request.Id.HasValue)
         {
+            if (request.PCode.HasValue)
+            {
+                (await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => x.GroupCode == request.PCode).AnyAsync()).ThrowIfTrue("上级已分配人员");
+            }
+
             var entity = request.Adapt<GainfoGroupEntity>();
             entity.Code = Guid.NewGuid();
             await _dbContext.InsertAsync(entity);