From 1b2c073398c674d9b0e4aaf51d5beaae0a1ee069 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 04 八月 2026 16:23:42 +0800
Subject: [PATCH] fix: 生产报工只看查看本人或者交接人
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 3 +++
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 6 ++++++
src/main/java/com/ruoyi/common/constant/Constants.java | 5 +++++
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 3 +++
4 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/ruoyi/common/constant/Constants.java
index d12c995..80a3705 100644
--- a/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -81,6 +81,11 @@
public static final String SUPER_ADMIN = "admin";
/**
+ * 杞﹂棿鍓富浠昏鑹叉潈闄愭爣璇�(鍙煡鐪嬪叏閮ㄥ伐鍗曟暟鎹�)
+ */
+ public static final String WORKSHOP_DEPUTY_DIRECTOR = "dwm";
+
+ /**
* 瑙掕壊鏉冮檺鍒嗛殧绗�
*/
public static final String ROLE_DELIMETER = ",";
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..0210141 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -43,4 +43,7 @@
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
+
+ @ApiModelProperty(value = "褰撳墠鐧诲綍鐢ㄦ埛ID(鏁版嵁鏉冮檺杩囨护鐢�)")
+ private Long currentUserId;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 9d96984..691118f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -9,8 +9,10 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MatrixToImageWriter;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
@@ -50,6 +52,10 @@
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
+ Long userId = SecurityUtils.getUserId();
+ if (!SecurityUtils.isAdmin(userId) && !SecurityUtils.hasRole(Constants.WORKSHOP_DEPUTY_DIRECTOR)) {
+ productWorkOrder.setCurrentUserId(userId);
+ }
return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
}
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 86d7512..60257a2 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -46,6 +46,9 @@
LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
where 1=1
+ <if test="c.currentUserId != null">
+ and (pwo.worker_id = #{c.currentUserId} or pwo.handover_user_id = #{c.currentUserId})
+ </if>
<if test="c.workOrderNo != null and c.workOrderNo != ''">
and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
</if>
--
Gitblit v1.9.3