步骤顺序逻辑修改

web/src/main/java/com/jpsoft/shinestar/modules/workflow/ProcessActivityController.java

@@ -1,5 +1,6 @@
 package com.jpsoft.shinestar.modules.workflow;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.Page;
 import com.jpsoft.shinestar.modules.base.entity.CompanyInfo;
 import com.jpsoft.shinestar.modules.base.entity.PersonInfo;
@@ -79,22 +80,24 @@ public class ProcessActivityController {
         MessageResult<ProcessActivity> msgResult = new MessageResult<>();
 
         try {
+            String condition = processActivity.getCondition();
             processActivity.setId(UUID.randomUUID().toString());
             processActivity.setCreateBy(subject);
             processActivity.setCreateTime(new Date());
             processActivity.setDelFlag(false);
+            processActivity.setCondition(StrUtil.replace(condition," ",""));
 
             String processTemplateId = processActivity.getProcessTemplateId();
             String personRoleId = processActivity.getPersonRoleId();
 
             int activityOrder = 1;
 
-            List<ProcessActivity> list = processActivityService.findByTemplateId(processTemplateId,personRoleId);
-            if(list.size()>0){
+            List<ProcessActivity> list = processActivityService.findByTemplateIdAndRoleIdAndCondition(processTemplateId,personRoleId,processActivity.getCondition());
+            /*if(list.size()>0){
                 ProcessActivity item = list.get(0);
                 activityOrder = item.getActivityOrder() + 1;
-            }
-            processActivity.setActivityOrder(activityOrder);
+            }*/
+            processActivity.setActivityOrder(activityOrder+ list.size());
 
             int affectCount = processActivityService.insertAndActUser(processActivity);