From edb81cb36ef2ff4560afdbe7918a747adbad998f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 10:58:26 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index a2b8c34..3da76a3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1435,6 +1435,7 @@
wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
wqq.in(TjOrderDetail::getProId, proIdList);
+ wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
List<TjOrderDetail> detailList = detailService.list(wqq);
if (detailList != null && detailList.size() > 0) {
List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
@@ -1442,6 +1443,8 @@
wq.eq("tj_number", tjNumber);
wq.in("pro_id", collect);
wq.ne("type", 2);
+ wq.ne("dept_id",241);
+ wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
List<TjOrderRemark> list = remarkService.list(wq);
if (list.size() == 0) {
return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
--
Gitblit v1.8.0