From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
index ea68d32..da60f04 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
@@ -7,7 +7,6 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
-
import java.util.HashMap;
import java.util.Map;
@@ -24,27 +23,29 @@
throws Exception {
String hql = " from " + Granary.class.getName()
+ " where companyId=:companyId";
-
+ if (null == param) {
+ param = new HashMap<>();
+ }
+ String companyId = (String) param.get("companyId");
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("companyId", companyId);
- if (null != param) {
+ String str = (String) param.get("deptId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and deptId =:deptId";
+ args.put("deptId", str);
+ }
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and cfbh =:depotId";
- args.put("depotId", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and ajmc like:name";
- args.put("name", "%" + str + "%");
- }
-
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and ajmc like:name";
+ args.put("name", "%" + str + "%");
}
String count = "select count(*) " + hql;
-
hql += " order by updateTime desc";
this.pagingQuery(page, hql, count, args);
--
Gitblit v1.9.3