From 6a2ada7070c8881840232c4611585adaabb2eb16 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 16 May 2024 14:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml  | 2 +-
 .../impl/DangerousEngineeringProgressRecordServiceImpl.java    | 3 +--
 .../impl/DangerousEngineeringSideStationServiceImpl.java       | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
index 928aa7237..7cb1dec04 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
@@ -26,7 +26,7 @@
             and project_sn = #{param.projectSn}
         </if>
         <if test="param.engineeringId != null and param.engineeringId != ''">
-            and enterprise_id = #{param.engineeringId}
+            and engineering_id = #{param.engineeringId}
         </if>
         AND `status` in (2, 3, 4)
         AND type = 1
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
index d79c7e3b2..c2b136446 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord;
 import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringProgressRecordMapper;
 import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService;
+import com.zhgd.xmgl.util.MapUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,13 +29,11 @@ public class DangerousEngineeringProgressRecordServiceImpl extends ServiceImpl<D
 
     @Override
     public List<DangerousEngineeringProgressRecord> selectEngineeringProgressList(Map<String, Object> map) {
-        map.putIfAbsent("type", 1);
         return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map);
     }
 
     @Override
     public Page<DangerousEngineeringProgressRecord> selectEngineeringProgressPage(Map<String, Object> map) {
-        map.putIfAbsent("type", 1);
         Page page = PageUtil.getPage(map);
         return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map, page);
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
index 3a6107e22..7287ecb90 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
@@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
 import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringSideStationMapper;
 import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.util.MapUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,13 +30,11 @@ public class DangerousEngineeringSideStationServiceImpl extends ServiceImpl<Dang
 
     @Override
     public List<DangerousEngineeringSideStation> selectSideStationList(Map<String, Object> map) {
-        map.putIfAbsent("type", 1);
         return dangerousEngineeringSideStationMapper.selectSideStationList(map);
     }
 
     @Override
     public Page<DangerousEngineeringSideStation> selectSideStationPage(Map<String, Object> map) {
-        map.putIfAbsent("type", 1);
         Page page = PageUtil.getPage(map);
         return dangerousEngineeringSideStationMapper.selectSideStationList(map, page);
     }