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 30e2999571a2b74e43192452ae125c118490c254..f85201740be98c8482df8c284b98aab5db56fefd 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);