diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
index 14092a2c..077e7887 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
@@ -89,29 +89,32 @@ public class GainfoGroupService : IGainfoGroupService
 
     public async Task AssignGainfosAsync(GainfoAssignRequest request)
     {
-        var pGrp = await _dbContext.Queryable<GainfoGroupEntity>().Where(x => x.Code == request.GroupCode).FirstAsync();
-        pGrp?.Editable.ThrowIfFalse("不可分配人员到当前分组");
-
+        if (request.UserNos.IsPresent())
+        {
+            var pGrp = await _dbContext.Queryable<GainfoGroupEntity>().Where(x => x.Code == request.GroupCode).FirstAsync();
+            pGrp?.Editable.ThrowIfFalse("不可分配人员到当前分组");
+        }
+        
         var existsNextGroup = await _dbContext.Queryable<GainfoGroupEntity>().Where(x => x.PCode == request.GroupCode).AnyAsync();
         existsNextGroup.ThrowIfTrue("存在下级分组,无法分配人员");
 
         await _devicePermissionService.GenerateDeviceTasksAsync(async () =>
         {
-             var relations = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => x.GroupCode == request.GroupCode).ToListAsync();
-             await _dbContext.DeleteReallyAsync(relations);
+            var relations = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => x.GroupCode == request.GroupCode).ToListAsync();
+            await _dbContext.DeleteReallyAsync(relations);
 
-             request.UserNos = await _dbContext.Queryable<GainfoEntity>().Where(x => request.UserNos.Contains(x.No)).Select(x => x.No).ToListAsync();
-             var entities = request.UserNos.Select(x => new GainfoGroupRelationshipEntity
-             {
-                 GroupCode = request.GroupCode,
-                 UserNo = x,
-                  
+            request.UserNos = await _dbContext.Queryable<GainfoEntity>().Where(x => request.UserNos.Contains(x.No)).Select(x => x.No).ToListAsync();
+            var entities = request.UserNos.Select(x => new GainfoGroupRelationshipEntity
+            {
+                GroupCode = request.GroupCode,
+                UserNo = x,
 
-             }).ToList();
 
-             await _dbContext.InsertAsync(entities);
+            }).ToList();
 
-         }, null);
+            await _dbContext.InsertAsync(entities);
+
+        }, null);
     }
 
     //******************************************************* help methods ***********************************************************
diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
index 6b8f2348..ddedd0ec 100644
--- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
@@ -1,7 +1,6 @@
 using Dlhis.Entity.Device.Enums;
 using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar;
-using Mapster;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
@@ -22,7 +21,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 设备唯一码,IP/MAC/SNO
     /// </summary>
-    [SugarColumn(ColumnDescription = "设备唯一码", UniqueGroupNameList = new[] { "Idx_Device_UniqueNo" })]
+    [SugarColumn(ColumnDescription = "设备唯一码", IsNullable = false, UniqueGroupNameList = new[] { "Idx_Device_UniqueNo" })]
     public string UniqueNo { get; set; }
 
     /// <summary>
diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
index 84708348..f1348681 100644
--- a/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
+++ b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
@@ -23,10 +23,10 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
     /// </summary>
     public string UserNo { get; set; }
 
-
     /// <summary>
     /// 设备唯一号
     /// </summary>
+    [SugarColumn(IsNullable = false, IndexGroupNameList = new[] { "idx_DeviceTask_DeviceUniqueNo" })]
     public string DeviceUniqueNo { get; set; }
 
     /// <summary>