Răsfoiți Sursa

Merge branch 'fix/passSame' into 'develop'

修正自动流转的错误

See merge request o2oa/o2oa!563
o2null 5 ani în urmă
părinte
comite
5691434a1c

+ 1 - 1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java

@@ -216,7 +216,7 @@ public class ManualProcessor extends AbstractManualProcessor {
 			}
 			}
 			for (TaskCompleted o : aeiObjects.getJoinInquireTaskCompleteds()) {
 			for (TaskCompleted o : aeiObjects.getJoinInquireTaskCompleteds()) {
 				if (StringUtils.equals(o.getActivityToken(), workLog.getArrivedActivityToken())) {
 				if (StringUtils.equals(o.getActivityToken(), workLog.getArrivedActivityToken())) {
-					List<String> values = ListUtils.union(identities,
+					List<String> values = ListUtils.intersection(identities,
 							aeiObjects.business().organization().identity().listWithPerson(o.getPerson()));
 							aeiObjects.business().organization().identity().listWithPerson(o.getPerson()));
 					if (!values.isEmpty()) {
 					if (!values.isEmpty()) {
 						TaskCompleted obj = new TaskCompleted(aeiObjects.getWork(), route, o);
 						TaskCompleted obj = new TaskCompleted(aeiObjects.getWork(), route, o);