修复已办人员身份修改导致的重复办理

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java

@@ -63,7 +63,7 @@ public class WebServer extends ConfigObject {
 	@FieldDescribe("是否启用application服务器代理")
 	private Boolean proxyApplicationEnable;
 
-	@FieldDescribe("是否启用长连接,默认false.")
+	@FieldDescribe("是否启用长连接,默认true.")
 	private Boolean persistentConnectionsEnable;
 
 	public Boolean getPersistentConnectionsEnable() {

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/ResponseFactory.java

@@ -182,7 +182,6 @@ public class ResponseFactory {
 		} else {
 			crc.update(XGsonBuilder.toJson(o).getBytes(DefaultCharset.charset_utf_8));
 		}
-		// crc.update(XGsonBuilder.toJson(o).getBytes(DefaultCharset.charset_utf_8));
 		return crc.getValue() + "";
 	}
 

o2server/x_processplatform_assemble_surface/src/test/resources/lob.json

@@ -1,4 +0,0 @@
-{
-	"data1": "asddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfas11",
-	"data2": "asddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfasasddfasdfas22"
-}

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

@@ -283,13 +283,15 @@ public class ManualProcessor extends AbstractManualProcessor {
 	protected List<Work> executing(AeiObjects aeiObjects, Manual manual) throws Exception {
 		List<Work> results = new ArrayList<>();
 		boolean passThrough = false;
-
 		List<String> identities = aeiObjects.business().organization().identity()
 				.list(aeiObjects.getWork().getManualTaskIdentityList());
+		// 去掉已经处理过的身份
+		identities = ListUtils.subtract(identities, ListTools.extractProperty(aeiObjects.getJoinInquireTaskCompleteds(),
+				TaskCompleted.identity_FIELDNAME, String.class, true, true));
 		identities = aeiObjects.business().organization().identity().list(identities);
-		if (identities.isEmpty()) {
+		// 现在处理人为空且没有参与流转的已办
+		if (identities.isEmpty() && aeiObjects.getJoinInquireTaskCompleteds().isEmpty()) {
 			identities = calculateTaskIdentities(aeiObjects, manual);
-
 			logger.info("工作设置的处理人已经全部无效,重新计算当前环节所有处理人进行处理,标题:{}, id:{}, 设置的处理人:{}.", aeiObjects.getWork().getTitle(),
 					aeiObjects.getWork().getId(), identities);
 			// 后面进行了identitis.remove()这里必须用一个新对象包装