Merge branch 'fix_20240123_UAT' into 'master'
fix: 企标制修订起草人选择多个时出错的问题 See merge request laws-foton-slrs/foton-wkflow-rest!79
This commit is contained in:
+11
-2
@@ -14,6 +14,7 @@ import net.sf.json.JSONArray;
|
|||||||
import net.sf.json.util.JSONTokener;
|
import net.sf.json.util.JSONTokener;
|
||||||
import org.activiti.engine.delegate.DelegateTask;
|
import org.activiti.engine.delegate.DelegateTask;
|
||||||
import org.activiti.engine.delegate.TaskListener;
|
import org.activiti.engine.delegate.TaskListener;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -56,8 +57,16 @@ public class ProcessstartAfter implements TaskListener {
|
|||||||
delegateTask.setVariable("Step3", object.getString("approver")); // 批准人员
|
delegateTask.setVariable("Step3", object.getString("approver")); // 批准人员
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
nextUserList.add(object.getString("drafter"));
|
String drafter = object.getString("drafter");
|
||||||
delegateTask.setVariable("createUser",object.getString("drafter")); // 技术标准起草人员
|
if (StringUtils.isBlank(drafter)) {
|
||||||
|
throw new RuntimeException("起草人员不能为空");
|
||||||
|
}
|
||||||
|
if (drafter.contains(",")) {
|
||||||
|
drafter = drafter.split(",")[0];
|
||||||
|
}
|
||||||
|
// 选择第一个起草人为主起草人
|
||||||
|
nextUserList.add(drafter);
|
||||||
|
delegateTask.setVariable("createUser",drafter); // 技术标准起草人员
|
||||||
delegateTask.setVariable("addFlag", object.getString("addFlag"));
|
delegateTask.setVariable("addFlag", object.getString("addFlag"));
|
||||||
|
|
||||||
// 处理 oaFlag 为待办
|
// 处理 oaFlag 为待办
|
||||||
|
|||||||
Reference in New Issue
Block a user