Showing
1 changed file
with
4 additions
and
6 deletions
... | ... | @@ -74,7 +74,7 @@ public class TkSceneLinkageServiceImpl |
74 | 74 | sceneLinkage.copyToDTO(sceneLinkageDTO); |
75 | 75 | } |
76 | 76 | |
77 | - updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage); | |
77 | + updateScene(sceneLinkageDTO, tenantId, customerId); | |
78 | 78 | |
79 | 79 | return sceneLinkageDTO; |
80 | 80 | } |
... | ... | @@ -85,14 +85,12 @@ public class TkSceneLinkageServiceImpl |
85 | 85 | * @param sceneLinkageDTO 场景联动表单数据 |
86 | 86 | * @param tenantId 租户ID |
87 | 87 | * @param customerId 客户ID |
88 | - * @param sceneLinkage 场景联动主表实体 | |
89 | 88 | */ |
90 | 89 | private void updateScene( |
91 | 90 | SceneLinkageDTO sceneLinkageDTO, |
92 | 91 | String tenantId, |
93 | - String customerId, | |
94 | - TkSceneLinkageEntity sceneLinkage) { | |
95 | - String organizationId = sceneLinkage.getOrganizationId(); | |
92 | + String customerId) { | |
93 | + String organizationId = sceneLinkageDTO.getOrganizationId(); | |
96 | 94 | List<DeviceDTO> organizationDevices = |
97 | 95 | findDeviceList(organizationId, tenantId, customerId, new ArrayList<>()); |
98 | 96 | |
... | ... | @@ -159,7 +157,7 @@ public class TkSceneLinkageServiceImpl |
159 | 157 | if (!sceneLinkage.getCreator().equals(currentUserId)) { |
160 | 158 | throw new TkDataValidationException("你不是此场景的创建者"); |
161 | 159 | } |
162 | - updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage); | |
160 | + updateScene(sceneLinkageDTO, tenantId, customerId); | |
163 | 161 | |
164 | 162 | sceneLinkageDTO.copyToEntity(sceneLinkage); |
165 | 163 | sceneLinkage.setTenantId(tenantId); | ... | ... |