fix 已知问题

Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

@@ -30,12 +30,6 @@ public class DeviceConnectService : IDeviceConnectService
         businessPlace.ThrowIfNull("营业点不存在");
 
         var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
-        if (device.DeployPlace.Equals("AUTO", StringComparison.OrdinalIgnoreCase))
-        {
-            device.DeployPlace = businessPlace.Name;
-            await _dbContext.UpdateAsync(device);
-        }
-
         var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.UniqueNo).SingleAsync();
 
         if (registry != null)
@@ -45,20 +39,28 @@ public class DeviceConnectService : IDeviceConnectService
             registry.BusinessPlaceCode = businessPlace.Code;
 
             await _dbContext.UpdateAsync(registry);
-            
-            return "请勿重复注册设备";
+        }
+        else
+        {
+            registry = new DeviceRegistryEntity
+            {
+                DeviceUniqueNo = request.UniqueNo,
+                LastHeartbeatTime = DateTime.Now,
+                RegisterTime = DateTime.Now,
+                BusinessPlaceCode = businessPlace.Code,
+                TenantId = device.TenantId
+            };
+
+            await _dbContext.InsertAsync(registry);
         }
 
-        registry = new DeviceRegistryEntity
-        {
-            DeviceUniqueNo = request.UniqueNo,
-            LastHeartbeatTime = DateTime.Now,
-            RegisterTime = DateTime.Now,
-            BusinessPlaceCode = businessPlace.Code,
-            TenantId = device.TenantId
-        };
+        if (request.DeployPlace.Equals("AUTO", StringComparison.OrdinalIgnoreCase))
+            device.DeployPlace = businessPlace.Name;
+        else
+            device.DeployPlace = request.DeployPlace.IsPresent() ? request.DeployPlace : businessPlace.Name;
+
+        await _dbContext.UpdateAsync(device);
 
-        await _dbContext.InsertAsync(registry);
         return "设备注册成功";
     }
 

Src/Dlhis.Basic/Organization/Request/GainfoMealPageRequest.cs

@@ -11,7 +11,7 @@ public class GainfoMealPageRequest : PageDto
     public DateTimePeriod SearchDateTimePeriod { get; set; }
 
     /// <summary>
-    /// 是否离职
+    /// 是否查询离职
     /// </summary>
     public bool IsLeave { get; set; }
 }

Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs

@@ -89,12 +89,14 @@ public class GainfoGroupService : IGainfoGroupService
                 .ToListAsync();
             await _dbContext.DeleteAsync(relations);
 
-            request.UserNos = await _dbContext.Queryable<GainfoEntity>()
-                .Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code))
+            var userNos = await _dbContext.Queryable<GainfoEntity>()
+                .Where(x => request.UserNos.Contains(x.No) || request.UserNos.Contains(x.Code)) //NO和工号匹配
                 .Select(x => x.No)
                 .ToListAsync();
 
-            var entities = request.UserNos.Select(x => new GainfoGroupRelationshipEntity
+            (userNos.Count != request.UserNos.Count).ThrowIfTrue("存在权限外人员,无法添加");
+
+            var entities = userNos.Select(x => new GainfoGroupRelationshipEntity
             {
                 GroupCode = request.GroupCode,
                 UserNo = x

Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs

@@ -43,13 +43,17 @@ public class GainfoOutsourceService : IGainfoOutsourceService
                 : await GetOutSourceCodeAsync();
 
             await _dbContext.InsertAsync(entity);
-            await _dbContext.InsertAsync(new OutsourceEntity
+
+            if (!await _dbContext.Queryable<OutsourceEntity>().Where(x => x.Code == entity.Code).AnyAsync())
             {
-                Code = entity.Code,
-                Supplier = request.ExternalInfo.Supplier,
-                SapCode = request.ExternalInfo.SapCode,
-                SapPhone = request.ExternalInfo.SapPhone
-            });
+                await _dbContext.InsertAsync(new OutsourceEntity
+                {
+                    Code = entity.Code,
+                    Supplier = request.ExternalInfo.Supplier,
+                    SapCode = request.ExternalInfo.SapCode,
+                    SapPhone = request.ExternalInfo.SapPhone
+                });
+            }
         }
         else
         {

Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs

@@ -239,8 +239,7 @@ public class GainfoService : IGainfoService
 
     public async Task<object> CheckIdNoAndNameMatchAsync(GainfoCheckIdNoAndNameRequest request)
     {
-        var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).FirstAsync(x => x.IdNo == request.IdNo && x.Name == request.Name);
-
+        var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).SingleAsync(x => x.IdNo == request.IdNo && x.Name == request.Name);
         gainfo.ThrowIfNull("验证失败!");
 
         var protector = _dataProtectionProvider.CreateProtector("gainfo:external:idno");