Просмотр исходного кода

Merge branch 'feature/add_process_version' into 'develop'

Merge of feature/[流程平台]流程版本管理的后台服务修改 to develop

See merge request o2oa/o2oa!238
o2null 5 лет назад
Родитель
Сommit
be9086b3ca

+ 3 - 1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java

@@ -250,7 +250,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<Process> list = em.createQuery(cq).getResultList();
 		if (list.isEmpty()) {
 			throw new ExceptionEntityNotExist(processFlag, Process.class);