From fae8a9349499cd045bc73e8fd22aeae52618a46c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 10:02:02 +0800
Subject: [PATCH] 采购明细查询修改，查询本级及以下
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 4 +++-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 1ac5ca9..7d7b63b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -305,7 +305,9 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- // formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ if (param2.getAgencyId() == null) {
+ formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ }
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
index 1d9d185..47be0cc 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
@@ -129,8 +129,8 @@
+ "LEFT JOIN l_wh_procure_model pm ON pm.FROM_PROCURE_GOODS_ID = fpg.id WHERE pm.BUSINESS_TYPE = 1 ");
// 鍙煡璇㈡湰鏈烘瀯鐨勯噰璐崟
if (param.getAgencyId() != null) {
- sql.append("and fp.AGENCY_ID = :agencyId ");
- paramts.put("agencyId", param.getAgencyId());
+ sql.append("and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
// 鍏ュ簱鍗曞彿
--
Gitblit v1.9.1