From a35666c8bc6d5dcc01debcdd940124a2da420f3d Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 22 May 2024 14:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/xz/emergency/mapper/XzEmergencyPushMapper.java | 2 ++
 .../xz/emergency/mapper/xml/XzEmergencyPushMapper.xml      | 7 ++++++-
 .../service/impl/XzEmergencyRecordServiceImpl.java         | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyPushMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyPushMapper.java
index 346cfbc2e..69e4d6b06 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyPushMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyPushMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyPush;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,6 +20,7 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
+@DataScope(includeTable = "enterprise_info")
 public interface XzEmergencyPushMapper extends BaseMapper<XzEmergencyPush> {
 
     IPage<XzEmergencyPush> queryList(Page<XzEmergencyPush> page, @Param("param") HashMap<String, Object> paramMap);
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyPushMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyPushMapper.xml
index 3eecc2716..4e066f4a3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyPushMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyPushMapper.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.xz.emergency.mapper.XzEmergencyPushMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyPush">
-        select t.*,
+        select
+        t.*,
+        ei.id as enterpriseId,
         ei.enterprise_name,
         t.emergencyManagerName
         from enterprise_info ei
@@ -17,5 +19,8 @@
         <if test="param.enterpriseId != null and param.enterpriseId != ''">
             and pe.enterprise_id = #{param.enterpriseId}
         </if>
+        <if test="param.enterpriseName != null and param.enterpriseName != ''">
+            and ei.enterprise_name like CONCAT(CONCAT('%', #{param.enterpriseName}), '%')
+        </if>
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
index 62ed26cd1..8f17ff879 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
@@ -195,10 +195,10 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
         XzEmergencyType type = xzEmergencyTypeMapper.selectById(entity.getEmergencyTypeId());
         for (String userId : userIds) {
             if (entity.getEmergencyTypeId() == -1) {
-                noticeService.addUserNoticeAndApp(Long.valueOf(userId), StrUtil.format("{}人员在{}位置发起一键报警，请及时救援！", wi.getWorkerName(), entity.getLongitude() == null || entity.getLatitude() == null ? "未知" : entity.getLongitude() + "," + entity.getLatitude()),
+                noticeService.addUserNoticeAndApp(Long.valueOf(userId), StrUtil.format("{}人员在{}位置发起一键报警，请及时救援！", wi.getWorkerName(), StrUtil.isNotBlank(entity.getIncidentSite()) ? entity.getIncidentSite() : "未知"),
                         "有应急消息待处理", "33");
             } else {
-                noticeService.addUserNoticeAndApp(Long.valueOf(userId), StrUtil.format("{}人员在{}位置发起【{}】应急报警，请及时救援！", wi.getWorkerName(), entity.getLongitude() == null || entity.getLatitude() == null ? "未知" : entity.getLongitude() + "," + entity.getLatitude(), type != null ? type.getEmergencyType() : "其他类型"),
+                noticeService.addUserNoticeAndApp(Long.valueOf(userId), StrUtil.format("{}人员在{}位置发起【{}】应急报警，请及时救援！", wi.getWorkerName(), StrUtil.isNotBlank(entity.getIncidentSite()) ? entity.getIncidentSite() : "未知", type != null ? type.getEmergencyType() : "其他类型"),
                         "有应急消息待处理", "33");
             }
         }