From 1de11bb110d24509da0673cd68e02f9a4cdcf7e3 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 25 Sep 2025 10:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProjectTeamMemberServiceImpl.java |  1 +
 .../HseSafetyInspectionQueryReq.java          |  7 ++++++
 .../impl/HseSafetyInspectionServiceImpl.java  | 24 ++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index 3d6d3943..56318f7c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -175,6 +175,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
             .set(SubConstructionUser::getEntryDate, new Date())
             .set(SubConstructionUser::getLeaveDate, null)
             .set(SubConstructionUser::getExitStatus, "0")
+            .set(SubConstructionUser::getTypeOfWork,req.getTypeOfWork())
             .set(constructionUser.getFirstDate() == null, SubConstructionUser::getFirstDate, LocalDate.now());
         constructionUserService.update(constructionUserLuw);
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java
index 8603a52a..e3b17f29 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java
@@ -55,4 +55,11 @@ public class HseSafetyInspectionQueryReq implements Serializable {
      */
     private String reviewType;
 
+    /**
+     * 整改人
+     */
+    private Long correctorId;
+
+
+    private Long createBy;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
index 8f6ef68e..5cc95743 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
@@ -127,17 +127,19 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
     @Override
     public TableDataInfo<HseSafetyInspectionVo> queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) {
         LambdaQueryWrapper<HseSafetyInspection> lqw = this.buildQueryWrapper(req);
-        Long userId = LoginHelper.getUserId();
-        if (userId != null) {
-            BusProjectTeamMember one = projectTeamMemberService.lambdaQuery()
-                .eq(BusProjectTeamMember::getMemberId, userId)
-                .eq(BusProjectTeamMember::getPostId, "0")
-                .last("limit 1")
-                .one();
-            if (one != null) {
-                lqw.eq(HseSafetyInspection::getCorrectorId, userId);
-            }
-        }
+        lqw.eq(req.getCorrectorId()!= null, HseSafetyInspection::getCorrectorId, req.getCorrectorId());
+        lqw.eq(req.getCreateBy() != null, HseSafetyInspection::getCreateBy, req.getCreateBy());
+//        Long userId = LoginHelper.getUserId();
+//        if (userId != null) {
+//            BusProjectTeamMember one = projectTeamMemberService.lambdaQuery()
+//                .eq(BusProjectTeamMember::getMemberId, userId)
+//                .eq(BusProjectTeamMember::getPostId, "0")
+//                .last("limit 1")
+//                .one();
+//            if (one != null) {
+//                lqw.eq(HseSafetyInspection::getCorrectorId, userId);
+//            }
+//        }
         Page<HseSafetyInspection> result = this.page(pageQuery.build(), lqw);
         return TableDataInfo.build(this.getVoPage(result));
     }