From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index ed3b663..8aef70c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -68,6 +68,8 @@
queryWrapper.eq("company_id", param.getCompanyId());
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
+ }else {
+ queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
}
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
@@ -79,6 +81,7 @@
queryWrapper.like("complete_status", param.getCompleteStatus());
}
+ queryWrapper.orderByDesc("id");
noticeInMapper.selectPage(page, queryWrapper);
}
@@ -266,6 +269,8 @@
queryWrapper.eq("company_id", param.getCompanyId());
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
+ }else {
+ queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
}
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
@@ -276,7 +281,7 @@
if (StringUtils.isNotBlank(param.getCompleteStatus())) {
queryWrapper.like("complete_status", param.getCompleteStatus());
}
-
+ queryWrapper.orderByDesc("id");
noticeOutMapper.selectPage(page, queryWrapper);
}
--
Gitblit v1.9.3