git config --global diff.guitool kdiff3

o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java

@@ -122,50 +122,50 @@ public class ScriptFactory {
 		return BooleanUtils.toBooleanObject(Objects.toString(o, "false"));
 	}
 
-	public static List<String> asDistinguishedName(Object o) throws Exception {
-		List<String> list = new ArrayList<>();
-		if (null != o) {
-			if (o instanceof CharSequence) {
-				list.add(Objects.toString(o));
-			} else if (o instanceof Iterable) {
-				for (Object obj : (Iterable<?>) o) {
-					if (null != obj) {
-						if (obj instanceof CharSequence) {
-							list.add(Objects.toString(obj));
-						} else {
-							Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
-							if (null != d) {
-								list.add(Objects.toString(d));
-							}
-						}
-					}
-				}
-			} else if (o instanceof ScriptObjectMirror) {
-				ScriptObjectMirror som = (ScriptObjectMirror) o;
-				if (som.isArray()) {
-					Object[] objs = (som.to(Object[].class));
-					for (Object obj : objs) {
-						if (null != obj) {
-							if (obj instanceof CharSequence) {
-								list.add(Objects.toString(obj));
-							} else {
-								Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
-								if (null != d) {
-									list.add(Objects.toString(d));
-								}
-							}
-						}
-					}
-				} else {
-					Object d = PropertyUtils.getProperty(o, JpaObject.DISTINGUISHEDNAME);
-					if (null != d) {
-						list.add(Objects.toString(d));
-					}
-				}
-			}
-		}
-		return list;
-	}
+//	public static List<String> asDistinguishedName(Object o) throws Exception {
+//		List<String> list = new ArrayList<>();
+//		if (null != o) {
+//			if (o instanceof CharSequence) {
+//				list.add(Objects.toString(o));
+//			} else if (o instanceof Iterable) {
+//				for (Object obj : (Iterable<?>) o) {
+//					if (null != obj) {
+//						if (obj instanceof CharSequence) {
+//							list.add(Objects.toString(obj));
+//						} else {
+//							Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
+//							if (null != d) {
+//								list.add(Objects.toString(d));
+//							}
+//						}
+//					}
+//				}
+//			} else if (o instanceof ScriptObjectMirror) {
+//				ScriptObjectMirror som = (ScriptObjectMirror) o;
+//				if (som.isArray()) {
+//					Object[] objs = (som.to(Object[].class));
+//					for (Object obj : objs) {
+//						if (null != obj) {
+//							if (obj instanceof CharSequence) {
+//								list.add(Objects.toString(obj));
+//							} else {
+//								Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
+//								if (null != d) {
+//									list.add(Objects.toString(d));
+//								}
+//							}
+//						}
+//					}
+//				} else {
+//					Object d = PropertyUtils.getProperty(o, JpaObject.DISTINGUISHEDNAME);
+//					if (null != d) {
+//						list.add(Objects.toString(d));
+//					}
+//				}
+//			}
+//		}
+//		return list;
+//	}
 
 	private static List<String> readAsStringList(Object obj) throws Exception {
 		List<String> list = new ArrayList<>();
@@ -264,6 +264,7 @@ public class ScriptFactory {
 				} else {
 					list.add(PropertyTools.getOrElse(o, JpaObject.DISTINGUISHEDNAME, String.class, ""));
 				}
+			// ScriptObject or JO
 			} else if (o instanceof ScriptObject) {
 				ScriptObject so = (ScriptObject) o;
 				if (so.isArray()) {

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCheckDraft.java

@@ -1,61 +0,0 @@
-//package com.x.processplatform.assemble.surface.jaxrs.work;
-//
-//import java.util.Objects;
-//
-//import org.apache.commons.lang3.BooleanUtils;
-//
-//import com.x.base.core.container.EntityManagerContainer;
-//import com.x.base.core.container.factory.EntityManagerContainerFactory;
-//import com.x.base.core.project.Applications;
-//import com.x.base.core.project.x_processplatform_service_processing;
-//import com.x.base.core.project.http.ActionResult;
-//import com.x.base.core.project.http.EffectivePerson;
-//import com.x.base.core.project.jaxrs.WoId;
-//import com.x.processplatform.assemble.surface.Business;
-//import com.x.processplatform.assemble.surface.ThisApplication;
-//import com.x.processplatform.assemble.surface.WorkControl;
-//import com.x.processplatform.core.entity.content.Work;
-//import com.x.processplatform.core.entity.element.ActivityType;
-//import com.x.processplatform.core.entity.element.Process;
-//
-//class ActionCheckDraft extends BaseAction {
-//
-//	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
-//		ActionResult<Wo> result = new ActionResult<>();
-//		Wo wo = new Wo();
-//		Work work = null;
-//		Process process = null;
-//		WoControl control = null;
-//		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-//			Business business = new Business(emc);
-//			work = emc.find(id, Work.class);
-//			if (null != work) {
-//				process = business.process().pick(work.getProcess());
-//				control = business.getControl(effectivePerson, work, WoControl.class);
-//			}
-//		}
-//		if ((null != process) && (null != control)) {
-//			if (BooleanUtils.isTrue(process.getCheckDraft())) {
-//				if (BooleanUtils.isTrue(control.getAllowDelete())) {
-//					if (BooleanUtils.isFalse(work.getDataChanged())
-//							&& Objects.equals(ActivityType.manual, work.getActivityType())) {
-//						wo = ThisApplication.context().applications()
-//								.deleteQuery(x_processplatform_service_processing.class,
-//										Applications.joinQueryUri("work", work.getId()), work.getJob())
-//								.getData(Wo.class);
-//						wo.setId(work.getId());
-//					}
-//				}
-//			}
-//		}
-//		result.setData(wo);
-//		return result;
-//	}
-//
-//	public static class Wo extends WoId {
-//
-//	}
-//
-//	public static class WoControl extends WorkControl {
-//	}
-//}

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

@@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -26,8 +25,6 @@ import com.x.processplatform.core.entity.element.Manual;
 import com.x.processplatform.service.processing.Business;
 import com.x.processplatform.service.processing.processor.AeiObjects;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-
 /**
  * 在Manual环节计算所有的待办人的Identity
  * 
@@ -116,46 +113,49 @@ public class TranslateTaskIdentityTools {
 					.getCompiledScript(aeiObjects.getWork().getApplication(), manual, Business.EVENT_MANUALTASK)
 					.eval(aeiObjects.scriptContext());
 			if (null != o) {
-				if (o instanceof CharSequence) {
-					taskIdentities.addIdentity(o.toString());
-				} else if (o instanceof JsonObject) {
-					JsonObject jsonObject = (JsonObject) o;
-					addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
-				} else if (o instanceof JsonArray) {
-					for (JsonElement jsonElement : (JsonArray) o) {
-						if (jsonElement.isJsonObject()) {
-							JsonObject jsonObject = jsonElement.getAsJsonObject();
-							addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
-						}
-					}
-				} else if (o instanceof Iterable) {
-					for (Object obj : (Iterable<?>) o) {
-						if (null != obj) {
-							if (obj instanceof CharSequence) {
-								taskIdentities.addIdentity(Objects.toString(obj, ""));
-							} else {
-								addObjectToTaskIdentities(taskIdentities, units, groups, obj);
-							}
-						}
-					}
-				} else if (o instanceof ScriptObjectMirror) {
-					ScriptObjectMirror som = (ScriptObjectMirror) o;
-					if (som.isArray()) {
-						Object[] objs = (som.to(Object[].class));
-						for (Object obj : objs) {
-							if (null != obj) {
-								if (obj instanceof CharSequence) {
-									taskIdentities.addIdentity(Objects.toString(obj, ""));
-								} else {
-									addObjectToTaskIdentities(taskIdentities, units, groups, obj);
-								}
-							}
-						}
-					} else {
-						addObjectToTaskIdentities(taskIdentities, units, groups, som);
-					}
-				}
+				addObjectToTaskIdentities(taskIdentities, units, groups, o);
 			}
+//			if (null != o) {
+//				if (o instanceof CharSequence) {
+//					taskIdentities.addIdentity(o.toString());
+//				} else if (o instanceof JsonObject) {
+//					JsonObject jsonObject = (JsonObject) o;
+//					addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
+//				} else if (o instanceof JsonArray) {
+//					for (JsonElement jsonElement : (JsonArray) o) {
+//						if (jsonElement.isJsonObject()) {
+//							JsonObject jsonObject = jsonElement.getAsJsonObject();
+//							addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
+//						}
+//					}
+//				} else if (o instanceof Iterable) {
+//					for (Object obj : (Iterable<?>) o) {
+//						if (null != obj) {
+//							if (obj instanceof CharSequence) {
+//								taskIdentities.addIdentity(Objects.toString(obj, ""));
+//							} else {
+//								addObjectToTaskIdentities(taskIdentities, units, groups, obj);
+//							}
+//						}
+//					}
+//				} else if (o instanceof ScriptObjectMirror) {
+//					ScriptObjectMirror som = (ScriptObjectMirror) o;
+//					if (som.isArray()) {
+//						Object[] objs = (som.to(Object[].class));
+//						for (Object obj : objs) {
+//							if (null != obj) {
+//								if (obj instanceof CharSequence) {
+//									taskIdentities.addIdentity(Objects.toString(obj, ""));
+//								} else {
+//									addObjectToTaskIdentities(taskIdentities, units, groups, obj);
+//								}
+//							}
+//						}
+//					} else {
+//						addObjectToTaskIdentities(taskIdentities, units, groups, som);
+//					}
+//				}
+//			}
 		}
 		return list;
 	}
@@ -222,25 +222,25 @@ public class TranslateTaskIdentityTools {
 		}
 	}
 
-	private static void addJsonObjectToTaskIdentities(TaskIdentities taskIdentities, List<String> units,
-			List<String> group, JsonObject jsonObject) throws Exception {
-		if (jsonObject.has(JpaObject.DISTINGUISHEDNAME)) {
-			String d = jsonObject.get(JpaObject.DISTINGUISHEDNAME).getAsString();
-			if (OrganizationDefinition.isIdentityDistinguishedName(d)) {
-				boolean ignore = false;
-				if (jsonObject.has(TaskIdentity.IGNOREEMPOWER)) {
-					ignore = BooleanUtils.isTrue(
-							BooleanUtils.toBooleanObject(jsonObject.get(TaskIdentity.IGNOREEMPOWER).getAsString()));
-				}
-				TaskIdentity taskIdentity = new TaskIdentity();
-				taskIdentity.setIdentity(d);
-				taskIdentity.setIgnoreEmpower(ignore);
-				taskIdentities.add(taskIdentity);
-			} else if (OrganizationDefinition.isUnitDistinguishedName(d)) {
-				units.add(d);
-			} else if (OrganizationDefinition.isGroupDistinguishedName(d)) {
-				units.add(d);
-			}
-		}
-	}
+//	private static void addJsonObjectToTaskIdentities(TaskIdentities taskIdentities, List<String> units,
+//			List<String> group, JsonObject jsonObject) throws Exception {
+//		if (jsonObject.has(JpaObject.DISTINGUISHEDNAME)) {
+//			String d = jsonObject.get(JpaObject.DISTINGUISHEDNAME).getAsString();
+//			if (OrganizationDefinition.isIdentityDistinguishedName(d)) {
+//				boolean ignore = false;
+//				if (jsonObject.has(TaskIdentity.IGNOREEMPOWER)) {
+//					ignore = BooleanUtils.isTrue(
+//							BooleanUtils.toBooleanObject(jsonObject.get(TaskIdentity.IGNOREEMPOWER).getAsString()));
+//				}
+//				TaskIdentity taskIdentity = new TaskIdentity();
+//				taskIdentity.setIdentity(d);
+//				taskIdentity.setIgnoreEmpower(ignore);
+//				taskIdentities.add(taskIdentity);
+//			} else if (OrganizationDefinition.isUnitDistinguishedName(d)) {
+//				units.add(d);
+//			} else if (OrganizationDefinition.isGroupDistinguishedName(d)) {
+//				units.add(d);
+//			}
+//		}
+//	}
 }