From 377900a395f0238c98c5fbc945c2bea302b964f1 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 17 十二月 2025 17:28:39 +0800
Subject: [PATCH] 新增设备维修保养过程描述，上传对应附件
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
index cfd04c5..7c96246 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -58,8 +58,11 @@
@Override
public IPage<SalesLedgerSchedulingDto> listPage(Page page, SalesLedgerSchedulingDto salesLedgerSchedulingDto) {
- salesLedgerSchedulingDto.setProductionUserId(SecurityUtils.getLoginUser().getUser().getUserId());
- salesLedgerSchedulingDto.setProductionUserName(SecurityUtils.getLoginUser().getUser().getNickName());
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if(!"admin".equals(loginUser.getUsername())){
+ salesLedgerSchedulingDto.setProductionUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+ salesLedgerSchedulingDto.setProductionUserName(SecurityUtils.getLoginUser().getUser().getNickName());
+ }
IPage<SalesLedgerSchedulingDto> list = salesLedgerSchedulingMapper.listPage(page, salesLedgerSchedulingDto);
if(list.getTotal() == 0){
return list;
@@ -292,8 +295,10 @@
@Override
public IPage<SalesLedgerSchedulingProcessDto> listPageProcess(Page page, SalesLedgerSchedulingProcessDto salesLedgerSchedulingDto) {
- Long userId = SecurityUtils.getLoginUser().getUserId();
- salesLedgerSchedulingDto.setProductionUserId(userId);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if(!"admin".equals(loginUser.getUsername())){
+ salesLedgerSchedulingDto.setProductionUserId(loginUser.getUserId());
+ }
IPage<SalesLedgerSchedulingProcessDto> list = salesLedgerSchedulingMapper.listPageProcess(page, salesLedgerSchedulingDto);
// Set<Long> collect = list.getRecords().stream().map(SalesLedgerSchedulingProcessDto::getId).collect(Collectors.toSet());
// if(CollectionUtils.isEmpty(collect)) return list;
--
Gitblit v1.9.3