fix 数据权限分组问题调整

2024-12-10 19:15:28 +08:00
parent 427a38eba4
commit 5843a4a2c8
2 changed files with 8 additions and 6 deletions
--- a/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
+++ b/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();