From 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 28 九月 2023 16:33:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
index 93ec27d..11ae2f6 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
@@ -34,7 +34,7 @@
String hql = " from " + Building.class.getName()
+ " where companyId=:companyId ";
if (null == parameter) {
- parameter = new HashMap<String, Object>();
+ parameter = new HashMap<>();
}
String companyId = (String) parameter.get("companyId");
@@ -44,7 +44,7 @@
parameter.put("companyId", companyId);
String deptId = (String) parameter.get("deptId");
- if(StringUtils.isNoneEmpty(deptId)){
+ if(StringUtils.isNotEmpty(deptId)){
hql += " and deptId=:deptId ";
parameter.put("deptId", deptId);
}
--
Gitblit v1.9.3