From a3bb6dce29295bfb904831995b0c918fbbcb9390 Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Tue, 14 Apr 2020 16:30:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9assign=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=9B=E5=BB=BA=E5=B7=A5=E4=BD=9C=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/processing/jaxrs/work/ActionAssignCreate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java index 30e2999571..f85201740b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java @@ -259,7 +259,9 @@ class ActionAssignCreate extends BaseAction { p = cb.or(p, cb.equal(root.get(Process_.alias), processFlag)); p = cb.or(p, cb.equal(root.get(Process_.id), processFlag)); p = cb.and(p, root.get(Process_.application).in(applicationIds)); - cq.select(root).where(p); + p = cb.and(p, cb.or(cb.isTrue(root.get(Process_.editionEnable)), + cb.isNull(root.get(Process_.editionEnable)))); + cq.select(root).where(p).orderBy(cb.desc(root.get(Process_.editionNumber))); List list = em.createQuery(cq).getResultList(); if (list.isEmpty()) { throw new ExceptionEntityNotExist(processFlag, Process.class); -- GitLab