From 606b4a645996d294c4c00b0925c271b3fb2b7f54 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Wed, 15 Apr 2026 08:50:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(confined-space):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/sdk-prod.yml                          | 2 +-
 start/src/main/resources/sdk.yml                               | 2 +-
 .../java/com/zcloud/eightwork/command/TaskLogUpdateExe.java    | 1 -
 .../java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java    | 2 ++
 .../eightwork/persistence/mapper/ConfinedSpaceMapper.java      | 2 +-
 .../repository/impl/ConfinedSpaceRepositoryImpl.java           | 2 +-
 .../src/main/resources/mapper/ConfinedSpaceMapper.xml          | 3 ++-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml
index 204c10b..b78ab3b 100644
--- a/start/src/main/resources/sdk-prod.yml
+++ b/start/src/main/resources/sdk-prod.yml
@@ -51,7 +51,7 @@ openapi:
       tenantIds: 1838408702262321152
 message:
   code:
-    list-check-taskLogTemplate: MS000127
+    taskLogTemplate: MS000127
 
 
 
diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml
index 204c10b..b78ab3b 100644
--- a/start/src/main/resources/sdk.yml
+++ b/start/src/main/resources/sdk.yml
@@ -51,7 +51,7 @@ openapi:
       tenantIds: 1838408702262321152
 message:
   code:
-    list-check-taskLogTemplate: MS000127
+    taskLogTemplate: MS000127
 
 
 
diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java
index 9db068d..2129e8a 100644
--- a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java
@@ -1372,7 +1372,6 @@ public class TaskLogUpdateExe {
     private EightworkInfoDO getEightworkInfoDO(String workId) {
         return eightworkInfoRepository.getOne(
                 new LambdaQueryWrapper<EightworkInfoDO>()
-                        .select(EightworkInfoDO::getId)
                         .eq(EightworkInfoDO::getWorkId, workId)
         );
     }
diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java
index 5dd4ba7..3528f98 100644
--- a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java
+++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java
@@ -28,5 +28,7 @@ public class ConfinedSpacePageQry extends PageQuery {
     private String likeCode;
     private String eqType;
     private String eqRiskLevel;
+
+    private String menuPath;
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java
index 5285141..e1a50d7 100644
--- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java
@@ -23,6 +23,6 @@ import java.util.Map;
 })
 public interface ConfinedSpaceMapper extends BaseMapper<ConfinedSpaceDO> {
 
-    IPage<EightworkInfoDO> listPage(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);
+    IPage<ConfinedSpaceDO> listPage(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java
index 7711c09..0e25567 100644
--- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java
@@ -32,7 +32,7 @@ public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl<ConfinedSpac
     @Override
     public PageResponse<ConfinedSpaceDO> listPage(Map<String, Object> params) {
         Page<Map<String,Object>> page =  new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString()));
-        IPage<EightworkInfoDO> iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list");
+        IPage<ConfinedSpaceDO> iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list");
         return PageHelper.pageToResponse(iPage, iPage.getRecords());
     }
 }
diff --git a/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml b/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml
index b1151a8..4c04ac4 100644
--- a/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml
@@ -4,7 +4,7 @@
 
 <mapper namespace="com.zcloud.eightwork.persistence.mapper.ConfinedSpaceMapper">
 
-    <select id="listPage" resultType="com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO">
+    <select id="listPage" resultType="com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO">
         select *
         from
             confined_space s
@@ -26,6 +26,7 @@
             and s.code like concat('%',#{params.likeCode},'%')
         </if>
         order by s.create_time desc
+        
     </select>
 </mapper>