diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java index 6341bdd..2e2e3b2 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/MessageWarnServiceImpl.java @@ -52,7 +52,7 @@ public class MessageWarnServiceImpl implements IMessageWarnService { .selectAs(Device::getDeviceName, MessageWarnVo::getDeviceName) .selectAs(Device::getSerialNum, MessageWarnVo::getSerialNum) .selectAs(Pond::getPondName, MessageWarnVo::getPondName) - .select("(SELECT COUNT(*) FROM aqu_map_message_warn_call_notice map WHERE map.message_warn_id = t.id AND map.tenant_id = t.tenant_id) AS callNoticeCount") + .select("(SELECT COUNT(DISTINCT n.mobile_phone) FROM aqu_map_message_warn_call_notice map INNER JOIN aqu_call_notice n ON n.id = map.call_notice_id WHERE map.message_warn_id = t.id AND map.tenant_id = t.tenant_id) AS callNoticeCount") .leftJoin(AquUser.class, AquUser::getId, MessageWarn::getUserId) .leftJoin(Device.class, Device::getId, MessageWarn::getDeviceId) .leftJoin(Pond.class, Pond::getId, Device::getPondId) @@ -101,7 +101,7 @@ public class MessageWarnServiceImpl implements IMessageWarnService { .selectAs(Device::getDeviceName, MessageWarnVo::getDeviceName) .selectAs(Device::getSerialNum, MessageWarnVo::getSerialNum) .selectAs(Pond::getPondName, MessageWarnVo::getPondName) - .select("(SELECT COUNT(*) FROM aqu_map_message_warn_call_notice map WHERE map.message_warn_id = t.id AND map.tenant_id = t.tenant_id) AS callNoticeCount") + .select("(SELECT COUNT(DISTINCT n.mobile_phone) FROM aqu_map_message_warn_call_notice map INNER JOIN aqu_call_notice n ON n.id = map.call_notice_id WHERE map.message_warn_id = t.id AND map.tenant_id = t.tenant_id) AS callNoticeCount") .leftJoin(AquUser.class, AquUser::getId, MessageWarn::getUserId) .leftJoin(Device.class, Device::getId, MessageWarn::getDeviceId) .leftJoin(Pond.class, Pond::getId, Device::getPondId)