Merge remote-tracking branch 'origin/add_pos_id_to_filter_users_with_role' into add_pos_id_to_filter_users_with_role

ibps-bpmn-root/modules/bpmn-act/src/main/resources/com/lc/ibps/bpmn/activiti/xml/transform.xsl

@@ -72,7 +72,7 @@
 					<bpm:attribute name="testNotifyType" value="inner"/>
 					<bpm:attribute name="skipFirstNode" value="true"/>
 					<bpm:attribute name="firstNodeUserAssign" value="false"/>
-					<bpm:attribute name="skipSameUser" value="true"/>
+					<bpm:attribute name="skipSameUser" value="false"/>
 					<bpm:attribute name="allowCopyTo" value="false"/>
 					<bpm:attribute name="allowTransTo" value="false"/>
 					<bpm:attribute name="allowReference" value="false"/>

ibps-bpmnbase-root/modules/bpmn-api/src/main/java/com/lc/ibps/bpmn/api/model/define/BpmDefineAttributes.java

@@ -26,7 +26,9 @@ public class BpmDefineAttributes implements Serializable {
 	 * ContextUtil.getCurrentUser().getFullname() ); map.put("startTime",
 	 * DateUtil.getCurrentDate());
 	 */
-	protected String subjectRule = "{发起人:startorName}在{发起时间:startTime}发起{流程标题:title}";
+	//protected String subjectRule = "{发起人:startorName}在{发起时间:startTime}发起{流程标题:title}";
+
+	protected String subjectRule = "{流程标题:title}";
 
 	/**
 	 * 流程描述
@@ -61,7 +63,7 @@ public class BpmDefineAttributes implements Serializable {
 	/**
 	 * 两个节点相同节点执行人跳过。
 	 */
-	protected boolean skipSameUser = true;
+	protected boolean skipSameUser = false;
 
 	/**
 	 * 允许抄送。