From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
index 7b5a279..4d2d3ab 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
@@ -32,6 +32,11 @@
hql += " and depotId =:depotId";
args.put("depotId", str);
}
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and user =:name";
+ args.put("name", "%" + str + "%");
+ }
}
@@ -92,7 +97,7 @@
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- data.setId(data.getDepotId() + DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
+ data.setId(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
session.save(data);
} else {
session.update(data);
--
Gitblit v1.9.3