Merge branch 'fix/#458' into 'wrdp'

仅针对job进行判断

See merge request o2oa/o2oa!2744

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionEdit.java

@@ -45,18 +45,9 @@ class ActionEdit extends BaseAction {
 				try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 					Record record = emc.find(id, Record.class);
 					Wi.copier.copy(bag.wi, record);
-					if (StringUtils.isNotEmpty(record.getWorkCompleted())) {
-						WorkCompleted workCompleted = emc.find(record.getWorkCompleted(), WorkCompleted.class);
-						if (null == workCompleted) {
-							throw new ExceptionEntityNotExist(record.getWorkCompleted(), WorkCompleted.class);
-						}
-						record.setJob(workCompleted.getJob());
-					} else {
-						Work work = emc.find(record.getWork(), Work.class);
-						if (null == work) {
-							throw new ExceptionEntityNotExist(record.getWork(), Work.class);
-						}
-						record.setJob(work.getJob());
+					if ((emc.countEqual(Work.class, Work.job_FIELDNAME, record.getJob()) == 0) && (emc
+							.countEqual(WorkCompleted.class, WorkCompleted.job_FIELDNAME, record.getJob()) == 0)) {
+						throw new ExceptionWorkOrWorkCompletedNotExist(record.getJob());
 					}
 					emc.beginTransaction(Record.class);
 					emc.check(record, CheckPersistType.all);

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ExceptionWorkOrWorkCompletedNotExist.java

@@ -0,0 +1,13 @@
+package com.x.processplatform.service.processing.jaxrs.record;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionWorkOrWorkCompletedNotExist extends PromptException {
+
+	private static final long serialVersionUID = -7038279889683420366L;
+
+	ExceptionWorkOrWorkCompletedNotExist(String job) {
+		super("工作或者已完成工作不存在,job: {}.", job);
+	}
+
+}