From 7b973b3b9b723f48c54f2c0c5083886573224541 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 05 一月 2026 16:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index 0c6c3e8..927c320 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -39,7 +39,9 @@
*/
@DataProvider
public Map<String, Object> getYearQuery(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
+
+ if(null == param) param = new HashMap<>();
+ Map<String, Object> result = new HashMap<>();
//鑾峰彇鍙傛暟涓垎搴撶紪鐮�
String deptId = (String)param.get("deptId");
@@ -61,6 +63,7 @@
InoutNoticeIn data = new InoutNoticeIn();
data.setId(ContextUtil.generateOrderId("RK"));
data.setName("鍏ュ簱閫氱煡鍗�");
+ data.setType("20");
data.setCompanyId(user.getCompanyId());
data.setDeptId(ContextUtil.subDeptId(user));
data.setYear(DateFormatUtils.format(new Date(), "yyyy"));
--
Gitblit v1.9.3