From f68f5bf6ae56c18561eb8ccba9fb9693f128551c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 11 二月 2026 09:36:07 +0800
Subject: [PATCH] 客户问题优化调整9

---
 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