From 06f4d2f5cc46ffa9402dcb4e6bec08fbab2bcfa6 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 02 三月 2026 15:51:29 +0800
Subject: [PATCH] 巡检轨迹查看修改
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 13 ++++++++++++-
1 files changed, 12 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 0d4ecbe..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
@@ -66,6 +66,11 @@
param.setCompanyId(ContextUtil.getCompanyId());
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());
}
@@ -76,6 +81,7 @@
queryWrapper.like("complete_status", param.getCompleteStatus());
}
+ queryWrapper.orderByDesc("id");
noticeInMapper.selectPage(page, queryWrapper);
}
@@ -261,6 +267,11 @@
param.setCompanyId(ContextUtil.getCompanyId());
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());
}
@@ -270,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