From 252a3ea73547d41112bdca9afb4c7a704edbe97f Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Wed, 29 Apr 2026 14:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/mapper/HiddenMapper.java      |  6 +++
 .../persistence/mapper/ai/AiAlarmMapper.java  |  5 ++
 .../mapper/ai/KeyProjectAlgorithmMapper.java  |  5 ++
 .../SafetyEnvironmentalInspectionMapper.java  |  6 +++
 .../SafetyEnvironmentalInspectionMapper.xml   | 50 +++++++++++--------
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java
index 2957e65..ea40493 100644
--- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenMapper.java
@@ -2,6 +2,8 @@ package com.zcloud.key.project.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO;
 import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,6 +19,10 @@ import java.util.Map;
  * @Date 2026-03-20 11:32:51
  */
 @Mapper
+
+@DataScopes({
+        @DataScope(method = "selectListPage", menuPerms = ""),
+})
 public interface HiddenMapper extends BaseMapper<HiddenDO> {
     IPage<HiddenDO> selectListPage(IPage<HiddenDO> page, @Param("params") Map<String, Object> params, String menuPerms);
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java
index f2e0099..df3660d 100644
--- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/AiAlarmMapper.java
@@ -2,6 +2,8 @@ package com.zcloud.key.project.persistence.mapper.ai;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -14,6 +16,9 @@ import java.util.Map;
  * @Date 2026-04-08 10:09:33
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectListPage", menuPerms = ""),
+})
 public interface AiAlarmMapper extends BaseMapper<AiAlarmDO> {
     IPage<AiAlarmDO> selectListPage(IPage<AiAlarmDO> iPage, Map<String, Object> params, String menuPerms);
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/KeyProjectAlgorithmMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/KeyProjectAlgorithmMapper.java
index f75ec4b..242ca6f 100644
--- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/KeyProjectAlgorithmMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/ai/KeyProjectAlgorithmMapper.java
@@ -2,6 +2,8 @@ package com.zcloud.key.project.persistence.mapper.ai;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.key.project.persistence.dataobject.ai.KeyProjectAlgorithmDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,6 +17,9 @@ import java.util.Map;
  * @Date 2026-04-08 10:09:30
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectListPage", menuPerms = ""),
+})
 public interface KeyProjectAlgorithmMapper extends BaseMapper<KeyProjectAlgorithmDO> {
     IPage<KeyProjectAlgorithmDO> selectListPage(IPage<KeyProjectAlgorithmDO> page, @Param("params") Map<String, Object> params , @Param("menuPerms") String menuPerms);
 }
diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
index 95030f8..74c3400 100644
--- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java
@@ -3,6 +3,8 @@ package com.zcloud.key.project.persistence.mapper.inspection;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
 import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +20,10 @@ import java.util.Map;
  * @Date 2026-03-20 16:16:05
  */
 @Mapper
+
+@DataScopes({
+        @DataScope(method = "selectListPage", menuPerms = ""),
+})
 public interface SafetyEnvironmentalInspectionMapper extends BaseMapper<SafetyEnvironmentalInspectionDO> {
     IPage<SafetyEnvironmentalInspectionDO> selectListPage(IPage<SafetyEnvironmentalInspectionDO> page, @Param("params") Map<String, Object> params, String menuPerms);
 
diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
index eb44e4f..04e1a78 100644
--- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml
@@ -4,6 +4,16 @@
 
 <mapper namespace="com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionMapper">
     <select id="selectListPage" resultType="com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO">
+        WITH max_iu_type AS (
+            SELECT
+                inspection_id,
+                MAX(type) AS max_type
+            FROM safety_environmental_inspection_user
+            WHERE delete_enum = 'FALSE'
+                AND type IN (2, 5)
+            GROUP BY inspection_id
+        )
+
         select
             i.*,
             kp.project_name,
@@ -15,24 +25,24 @@
             safety_environmental_inspection i
             left join key_project kp on kp.key_project_id = i.key_project_id
             left join user creu on creu.id = i.create_id
-            left join (
-                 SELECT
-                     inspection_id,
-                     department_id,
-                     user_id,
-                     type,
-                     RANK() OVER (
-                         PARTITION BY inspection_id
-                         ORDER BY type DESC
-                     ) AS rn
-                 FROM safety_environmental_inspection_user
-                 WHERE delete_enum = 'FALSE'
-                    AND type IN (2, 5)
-                 ) iu on iu.inspection_id = i.inspection_id AND iu.rn = 1
+            JOIN max_iu_type mt
+                ON mt.inspection_id = i.inspection_id
+
+            <!-- 展示用：最大 type 下的所有人员，不限制 status -->
+            LEFT JOIN safety_environmental_inspection_user iu_show
+                ON iu_show.inspection_id = i.inspection_id
+                AND iu_show.delete_enum = 'FALSE'
+                AND iu_show.type = mt.max_type
+
+            <!-- 过滤用：最大 type 下 status = 0 的人员 -->
+            JOIN safety_environmental_inspection_user iu
+                ON iu.inspection_id = i.inspection_id
+                AND iu.delete_enum = 'FALSE'
+                AND iu.type = mt.max_type
+                AND iu.STATUS = 0
             left join user iuu on iuu.id = iu.user_id
             left join corp_info indc on indc.id = i.inspected_corpinfo_id
             left join user xmu on xmu.id = i.xgf_master_user_id
---             left join safety_environmental_inspection_user seiu on seiu.inspection_id = i.inspection_id
         where i.delete_enum = 'FALSE'
         <if test="params.place != null and params.place != ''">
             and i.place LIKE CONCAT('%', #{params.place}, '%')
@@ -61,8 +71,8 @@
         </if>
         <if test="params.statusList != null and params.statusList.size() > 0">
             and i.status in
-            <foreach item="status" collection="params.statusList" separator="," open="(" close=")" index="">
-                #{status}
+            <foreach item="st" collection="params.statusList" separator="," open="(" close=")" >
+                #{st}
             </foreach>
         </if>
 
@@ -71,7 +81,7 @@
             HAVING inspection_user_name LIKE CONCAT('%', #{params.inspectionUserName}, '%')
         </if>
         ORDER BY
-            CASE WHEN i.status = 6 THEN 0 ELSE 1 END,
+            FIELD(i.status, 6) DESC,
             i.create_time desc
     </select>
 
@@ -202,8 +212,8 @@
         </if>
         <if test="params.statusList != null and params.statusList.size() > 0">
             and i.status in
-            <foreach item="status" collection="params.statusList" separator="," open="(" close=")" index="">
-                #{status}
+            <foreach item="st" collection="params.statusList" separator="," open="(" close=")" index="">
+                #{st}
             </foreach>
         </if>
         <if test="params.ids != null and params.ids.size() > 0">