diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java index 366fb28..88a8c48 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/service/BdServiceImpl.java @@ -162,8 +162,8 @@ public class BdServiceImpl { param.setDevCode(param.getDeviceId()); String bidCode=mapper.getBidCodeByBd(param); param.setBidCode(bidCode); -// String type=param.getEventCode().replaceAll("Alarm","").trim(); -// param.setType(type); +// String type=param.getEventCode().replaceAll("Alarm","").trim(); +// param.setType(type); WarnInfoVo vo=mapper.getDeviceInfo(param); param.setDeviceId(vo.getDeviceId()); param.setAttributeId(vo.getAttributeId()); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml index 1dc9b7d..c5823bd 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/PersonnelControlMapper.xml @@ -21,8 +21,8 @@ DELETE tb_pro_fence, tb_fence_detail FROM tb_pro_fence - JOIN tb_fence_detail ON tb_pro_fence.id = tb_fence_detail.fence_id - WHERE tb_pro_fence.id = #{id}; + LEFT JOIN tb_fence_detail ON tb_pro_fence.id = tb_fence_detail.fence_id + WHERE tb_pro_fence.id = #{id}