调整configSample

o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java

@@ -21,16 +21,19 @@ import org.apache.commons.lang3.reflect.MethodUtils;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.config.AppStyle;
 import com.x.base.core.project.config.Cache;
-import com.x.base.core.project.config.CenterServer;
 import com.x.base.core.project.config.Collect;
 import com.x.base.core.project.config.Communicate;
 import com.x.base.core.project.config.Components;
 import com.x.base.core.project.config.ConfigObject;
 import com.x.base.core.project.config.Dingding;
 import com.x.base.core.project.config.DumpRestoreData;
+import com.x.base.core.project.config.Email;
 import com.x.base.core.project.config.Exmail;
+import com.x.base.core.project.config.HuaweiPushConfig;
 import com.x.base.core.project.config.JpushConfig;
 import com.x.base.core.project.config.LogLevel;
+import com.x.base.core.project.config.MPweixin;
+import com.x.base.core.project.config.MQ;
 import com.x.base.core.project.config.Meeting;
 import com.x.base.core.project.config.Messages;
 import com.x.base.core.project.config.Node;
@@ -66,21 +69,26 @@ public class CreateConfigSample {
 		File dir = new File(base, "configSample");
 		List<Class<?>> classes = new ArrayList<>();
 		classes.add(AppStyle.class);
-		classes.add(CenterServer.class);
+		classes.add(Cache.class);
 		classes.add(Collect.class);
 		classes.add(Communicate.class);
 		classes.add(Components.class);
 		classes.add(Dingding.class);
 		classes.add(DumpRestoreData.class);
+		classes.add(Email.class);
 		classes.add(Exmail.class);
+		classes.add(HuaweiPushConfig.class);
+		classes.add(JpushConfig.class);
 		classes.add(LogLevel.class);
 		classes.add(Meeting.class);
 		classes.add(Messages.class);
+		classes.add(MPweixin.class);
+		classes.add(MQ.class);
 		classes.add(Node.class);
+		classes.add(Organization.class);
 		classes.add(Person.class);
 		classes.add(Portal.class);
 		classes.add(ProcessPlatform.class);
-		classes.add(JpushConfig.class);
 		classes.add(Qiyeweixin.class);
 		classes.add(Query.class);
 		classes.add(Token.class);
@@ -88,8 +96,6 @@ public class CreateConfigSample {
 		classes.add(WeLink.class);
 		classes.add(WorkTime.class);
 		classes.add(ZhengwuDingding.class);
-		classes.add(Organization.class);
-		classes.add(Cache.class);
 
 		Collections.sort(classes, (c1, c2) -> c1.getCanonicalName().compareTo(c2.getCanonicalName()));
 		for (Class<?> cls : classes) {

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

@@ -337,7 +337,8 @@ public class ManualProcessor extends AbstractManualProcessor {
 	@Override
 	protected void executingCommitted(AeiObjects aeiObjects, Manual manual, List<Work> works) throws Exception {
 		// Manual Work 还没有处理完 发生了停留,出发了停留事件
-		if ((ListTools.isEmpty(works)) && this.hasManualStayScript(manual)) {
+		if ((ListTools.isEmpty(works)) && this.hasManualStayScript(manual)
+				&& (!aeiObjects.getCreateTasks().isEmpty())) {
 			CompiledScript cs = aeiObjects.business().element().getCompiledScript(aeiObjects.getApplication().getId(),
 					aeiObjects.getActivity(), Business.EVENT_MANUALSTAY);
 			ScriptContext scriptContext = aeiObjects.scriptContext();