fix 数据绑定调整

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

@@ -26,7 +26,9 @@ public class DeviceConnectService : IDeviceConnectService
 
     public async Task<string> RegisterAsync(DeviceRegisterRequest request)
     {
-        var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).SingleAsync();
+        var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>()
+            .Where(x => x.CustomCode == request.BusinessCustomCode)
+            .SingleAsync();
         businessPlace.ThrowIfNull("营业点不存在");
 
         var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
@@ -47,8 +49,7 @@ public class DeviceConnectService : IDeviceConnectService
                 DeviceUniqueNo = request.UniqueNo,
                 LastHeartbeatTime = DateTime.Now,
                 RegisterTime = DateTime.Now,
-                BusinessPlaceCode = businessPlace.Code,
-                TenantId = device.TenantId
+                BusinessPlaceCode = businessPlace.Code
             };
 
             await _dbContext.InsertAsync(registry);
@@ -163,7 +164,6 @@ public class DeviceConnectService : IDeviceConnectService
     private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "")
     {
         var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == uniqueNo).SingleAsync();
-
         if (checkExists)
         {
             device.ThrowIfNull($"未知的设备唯一编码{uniqueNo}");
@@ -195,14 +195,6 @@ public class DeviceConnectService : IDeviceConnectService
 
                 await _dbContext.InsertAsync(device);
             }
-            else
-            {
-                if (tenantId.IsPresent())
-                {
-                    device.TenantId = tenantId;
-                    await _dbContext.UpdateAsync(device);
-                }
-            }
         }
 
         return device;

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -276,7 +276,7 @@ public class OrderService : IOrderService
             .Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo && x.BusinessPlaceCode.HasValue)
             .Select((x, b, bs) => new
             {
-                b.Code, bs.ShiftCode, Factory = x.TenantId
+                b.Code, bs.ShiftCode, Factory = b.TenantId
             })
             .SingleAsync();
 
@@ -615,7 +615,7 @@ public class OrderService : IOrderService
             .Where(x => x.DeviceUniqueNo == deviceUniqueNo && x.BusinessPlaceCode.HasValue)
             .Select((x, b, bs) => new
             {
-                b.Code, bs.ShiftCode, Factory = x.TenantId
+                b.Code, bs.ShiftCode, Factory = b.TenantId
             })
             .SingleAsync();
 

Src/Dlhis.Entity/Device/Entities/DeviceRegistryEntity.cs

@@ -1,5 +1,4 @@
-using Kurisu.AspNetCore.DataAccess.Entity;
-using Kurisu.AspNetCore.DataAccess.SqlSugar;
+using Kurisu.AspNetCore.DataAccess.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Device.Entities;
@@ -8,7 +7,7 @@ namespace Dlhis.Entity.Device.Entities;
 /// 设备注册表
 /// </summary>
 [SugarTable(TableName = "DeviceRegistry", TableDescription = "设备注册表")]
-public class DeviceRegistryEntity : SugarBaseEntity, ITenantId
+public class DeviceRegistryEntity : SugarBaseEntity
 {
     /// <summary>
     /// 设备唯一号
@@ -33,6 +32,4 @@ public class DeviceRegistryEntity : SugarBaseEntity, ITenantId
     /// </summary>
     [SugarColumn(IsNullable = true, ColumnDescription = "营业点code")]
     public Guid? BusinessPlaceCode { get; set; }
-
-    public string TenantId { get; set; }
 }