fix 数据权限分组问题调整

Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs

@@ -69,13 +69,13 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc
                 {
                     deviceCodes = db.Queryable<DeviceGroupRelationshipEntity>().Where(x => myDeviceGroupCodes.Contains(x.GroupCode)).Select(x => x.DeviceCode).ToList();
                 }
-
-                if (deviceGroupCodeProperty != null)
-                {
-                    dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
-                }
             }
 
+            if (deviceGroupCodeProperty != null)
+            {
+                dict.Add(deviceGroupCodeProperty.Name, deviceGroupCodes);
+            }
+            
             if (deviceCodeProperty != null)
             {
                 var currentDeviceCodes = userDataPermissions.Where(x => x.UniqueType == DeviceAssignmentTypeEnumType.Device).Select(x => x.UniqueValue).ToList();

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

@@ -1,4 +1,5 @@
-using Dlhis.Entity.Device.Enums;
+using Dlhis.DataPermission.Model;
+using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.DataAccess.Entity;
 using Kurisu.AspNetCore.DataAccess.SqlSugar;
 using SqlSugar;
@@ -27,6 +28,7 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     /// <summary>
     /// 设备组code
     /// </summary>
+    [DeviceGroupCode]
     [SugarColumn(ColumnDescription = "设备组code")]
     public Guid Code { get; set; }