From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 2 +-
admin-web/public/static/config.js | 8 ++++----
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 383e3f6..09bd03b 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -9,8 +9,8 @@
// 鎺ュ彛璇锋眰鍦板潃
- // ftpUrl: 'http://172.16.60.172:8083/lowConsum',//寮�鍙�
- // apiBaseURL: 'http://172.16.60.172:8083/lowConsum',//寮�鍙�
+ ftpUrl: 'http://172.16.60.172:8083/lowConsum',//寮�鍙�
+ apiBaseURL: 'http://172.16.60.172:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'http://172.16.60.110:8083/lowConsum',//寮�鍙�
@@ -20,8 +20,8 @@
// apiBaseURL: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
- ftpUrl: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
- apiBaseURL: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
+ // ftpUrl: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
+ // apiBaseURL: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
};
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 6d5ab37..e6538a8 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
@@ -289,7 +289,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ // 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/FinSysTenantServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
index dd8c2dc..a1db344 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
@@ -142,7 +142,7 @@
List<Map<String, Object>> list = this.select(sql.toString(), paramts);
long id = 0L;
- if (!CollectionUtils.isEmpty(list)) {
+ if (!CollectionUtils.isEmpty(list) && list.get(0).get("max(id)")!=null) {
id = (Long) list.get(0).get("max(id)") + 1;
} else {
id = param.getParentId() * 1000 + 1;
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 7404a41..1d9d185 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,7 +129,7 @@
+ "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 like :agencyId ");
+ sql.append("and fp.AGENCY_ID = :agencyId ");
paramts.put("agencyId", param.getAgencyId());
}
--
Gitblit v1.9.1