From e39bddf535c89c9a7fe5789c01a17f92d4e596e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 04 八月 2026 16:46:13 +0800
Subject: [PATCH] fix: 车间主任查看修改
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 12 +++++++++++-
src/main/java/com/ruoyi/common/constant/Constants.java | 7 ++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/ruoyi/common/constant/Constants.java
index 80a3705..ab5787b 100644
--- a/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -83,7 +83,12 @@
/**
* 杞﹂棿鍓富浠昏鑹叉潈闄愭爣璇�(鍙煡鐪嬪叏閮ㄥ伐鍗曟暟鎹�)
*/
- public static final String WORKSHOP_DEPUTY_DIRECTOR = "dwm";
+ public static final String WORKSHOP_DEPUTY_DIRECTOR = "wm";
+
+ /**
+ * 杞﹂棿涓讳换宀椾綅缂栫爜(鍙煡鐪嬪叏閮ㄥ伐鍗曟暟鎹�)
+ */
+ public static final String WORKSHOP_DIRECTOR_POST = "wm";
/**
* 瑙掕壊鏉冮檺鍒嗛殧绗�
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 691118f..062c27e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -19,7 +19,9 @@
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductWorkOrderFile;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -50,11 +52,19 @@
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private SysPostMapper sysPostMapper;
+
@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);
+ List<SysPost> posts = sysPostMapper.selectPostsByUserName(SecurityUtils.getUsername());
+ boolean isWorkshopDirector = CollectionUtils.isNotEmpty(posts)
+ && posts.stream().anyMatch(post -> Constants.WORKSHOP_DIRECTOR_POST.equals(post.getPostCode()));
+ if (!isWorkshopDirector) {
+ productWorkOrder.setCurrentUserId(userId);
+ }
}
return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
}
--
Gitblit v1.9.3