From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/view/GranaryPR.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
index 81310e9..6dc435d 100644
--- a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
@@ -5,10 +5,12 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.Granary;
+import com.ld.igds.util.ContextUtil;
import com.ld.igds.view.service.HGranaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,6 +34,12 @@
@DataProvider
public void pageGranary(Page<Granary> page, Map<String, Object> param)
throws Exception {
+ if(null == param){
+ param = new HashMap<>();
+ }
+ if(null == param.get("deptId")){
+ param.put("deptId", ContextUtil.subDeptId(null));
+ }
granaryService.pageData(page, param);
}
--
Gitblit v1.9.3