diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 91019ab8..d46ac987 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -27,23 +27,23 @@ public class DevicePermissionService : IDevicePermissionService
 
     public async Task AssignAsync(DevicePermissionSaveReuqest reuqest)
     {
+        var tenantId = reuqest.AssignType == AssignTypeEnumType.Department ? reuqest.TenantId : _currentUser.GetStringTenantId();
+
+        //删除当前匹配的基地权限
+        var p = await _dbContext.Queryable<DevicePermissionEntity>()
+           .Where(x => x.AssignType == reuqest.AssignType)
+           .Where(x => x.AssignValue == reuqest.AssignValue)
+           .Where(x => x.UniqueType == reuqest.UniqueType)
+           .Where(x => x.TenantId == tenantId)
+           .ToListAsync();
+
+        await _dbContext.DeleteReallyAsync(p);
+
         await GenerateDeviceTasksAsync(async () =>
         {
-            //删除当前匹配的基地权限
-            var p = await _dbContext.Queryable<DevicePermissionEntity>()
-               .Where(x => x.AssignType == reuqest.AssignType)
-               .Where(x => x.AssignValue == reuqest.AssignValue)
-               .Where(x => x.UniqueType == reuqest.UniqueType)
-               .WhereIF(reuqest.AssignType == AssignTypeEnumType.Department, x => x.TenantId == reuqest.TenantId)
-               .ToListAsync();
-
-            await _dbContext.DeleteReallyAsync(p);
-
             //保存配置的权限
             if (reuqest.Codes.IsPresent())
             {
-                var tenantId = reuqest.AssignType == AssignTypeEnumType.Department ? reuqest.TenantId : _currentUser.GetStringSubjectId();
-
                 var devicePermissions = reuqest.Codes.Select(code => new DevicePermissionEntity
                 {
                     AssignType = reuqest.AssignType,