From 65dcb16e025e2e7e155c9ea494a815935826d75f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 08 八月 2026 17:55:19 +0800
Subject: [PATCH] fix: 根据编号倒序
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
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