From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期四, 29 六月 2023 19:33:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java index 5b4b8b6..30878f1 100644 --- a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java +++ b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java @@ -25,7 +25,7 @@ args.put("companyId", ContextUtil.getCompanyId()); args.put("deptId", ContextUtil.subDeptId(null)); - if (null != param || param.size() != 0) { + if (null != param && param.size() != 0) { String str = (String) param.get("type"); if (StringUtils.isNotEmpty(str)) { hql += " and type =:type"; -- Gitblit v1.9.3