From 38936f85fb8fda386fbc5b1667e0e95276f48021 Mon Sep 17 00:00:00 2001 From: o2null Date: Tue, 20 Oct 2020 03:15:28 +0000 Subject: [PATCH] Merge branch 'fix/serial' into 'develop' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix/serial See merge request o2oa/o2oa!1862 (cherry picked from commit dc4954e9214b002efa98164274e78dbf603b7335) 25da90a7 编号由流程改为应用 eb50f285 恢复ScriFactory --- .../com/x/processplatform/service/processing/SerialBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/SerialBuilder.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/SerialBuilder.java index c90e6e53c8..c58d7aee5f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/SerialBuilder.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/SerialBuilder.java @@ -195,7 +195,7 @@ public class SerialBuilder { CriteriaBuilder cb = em.getCriteriaBuilder(); CriteriaQuery cq = cb.createQuery(SerialNumber.class); Root root = cq.from(SerialNumber.class); - Predicate p = cb.equal(root.get(SerialNumber_.process), process.getId()); + Predicate p = cb.equal(root.get(SerialNumber_.application), process.getApplication()); p = cb.and(p, cb.equal(root.get(SerialNumber_.name), name)); cq.select(root).where(p); List list = em.createQuery(cq).setMaxResults(1).getResultList(); -- GitLab