From ed6c6350015d52ea1cb033c7558f72b721ece84a Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 19:58:55 +0800
Subject: [PATCH] 打包名称修改，去除错误输出
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 ef8e0db..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);
}
@@ -455,6 +457,9 @@
if (StrUtil.isEmpty(goodsType)) {
throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝鐗╁搧绫诲瀷涓嶈兘涓虹┖锛�" + goodsType);
}
+ if(!"鑷噰".equals(goodsType) && !"闆嗛噰".equals(goodsType)){
+ throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝鐗╁搧绫诲瀷鍙栧�间负[鑷噰/闆嗛噰] 鏁版嵁婧愬�间负锛�" + goodsType);
+ }
// 绗竴娆¤繘鏉ユ妸澶栧眰鐨勫�艰缃竴涓�
if (lWhFormProcureParam.getAgencyId() == null) {
--
Gitblit v1.9.1