合并分支 'dev_20230216' 到 'master'

制修订除 立项外 其他的不在跳转起草页面

查看合并请求 laws-foton-slrs/foton-wkflow-rest!38

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.entity.*;
 import com.ydw.bat.wkflow.business_main.datas.service.*;
+import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
 import com.ydw.bat.wkflow.listener.bussLibrary.Utils.FlowFinishEnum;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import net.sf.json.JSONArray;
@@ -444,5 +445,9 @@ public class ProcessStep4After implements TaskListener {
                 esPrcRelationService.addEsPrcRelation(object.getString("esId"), null, delegateTask.getProcessInstanceId());
             }
         }
+        if(!"5".equals(type)){
+            delegateTask.setVariable("bzfgbzFlag",2);
+            BussUtils.endFunAll(delegateTask, prcName, busBean, object, "0", busProcessNameService, "25");
+        }
     }
 }