Commit 08b4021aabc972ebe03718bd391e1d28acc374a9

Authored by chenjunyu_1481036421
1 parent 8a57186a

fix:编辑场景联动验证触发器设备是否属于当前选择组织的取值错误

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