From 2d94ddd240fca69ebbc4b0570abb30c803db7754 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 11:33:44 +0800
Subject: [PATCH] fix: 区分基础数据与生产计划数据查询
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 6399b32..7e5f58b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
+import com.ruoyi.production.dto.UserAccountDto;
+import com.ruoyi.production.dto.UserProductionAccountingDto;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
@@ -43,6 +46,10 @@
@Override
public IPage<SalesLedgerProductionAccountingDto> pageProductionAccounting(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
// TODO 绠＄悊鍛樻煡璇㈡墍鏈夛紝鍏朵粬浜哄彧鑳芥煡鑷繁
+ boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
+ if (!admin) {
+ salesLedgerProductionAccountingDto.setSchedulingUserName(SecurityUtils.getUsername());
+ }
if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
salesLedgerProductionAccountingDto.setEntryDate(null);
}else {
@@ -63,6 +70,11 @@
return productionProductMainMapper.listProductionDetails(salesLedgerProductionAccountingDto, page);
}
+ @Override
+ public UserAccountDto getByUserId(UserProductionAccountingDto userProductionAccountingDto) {
+ return salesLedgerProductionAccountingMapper.getByUserId( userProductionAccountingDto);
+ }
+
public static boolean isNumeric(String str) {
if (str == null || str.isEmpty()) {
return false;
--
Gitblit v1.9.3