|
|
@@ -998,7 +998,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
|
|
|
//查询喇叭是否配置在预案中
|
|
|
List<LabRiskPlanHardwareRelation> riskPlanHardwareList = labRiskPlanLevel.getRiskPlanHardwareList();
|
|
|
riskPlanHardwareList.forEach(labRiskPlanHardwareRelation -> {
|
|
|
- if (labRiskPlanHardwareRelation.getHardwareType().equals(HardwareTypeEnum.LOUDSPEAKER.getCode())) {
|
|
|
+ if (labRiskPlanHardwareRelation.getHardwareType().equals(HardwareTypeEnum.LOUDSPEAKER.getCode()) && labRiskPlanHardwareRelation.getOperate().equals("1")) {
|
|
|
//这里查询预案下的合成音乐
|
|
|
LabAudioSynthesis labAudioSynthesis = new LabAudioSynthesis();
|
|
|
labAudioSynthesis.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());
|