diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java index a45f4bb0..d72d6258 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -23,6 +24,13 @@ public class BussLibrary2Before implements TaskListener{ queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); queryWrapper1.orderByDesc("CREATE_TIME"); + + JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class); + if(fileList != null && !fileList.isEmpty()){ + fileList=new JSONArray(); + delegateTask.setVariable("fileModelList",fileList); + } + List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java index 6b4cf23e..e5aedf7e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -24,6 +25,12 @@ public class BussLibrary5Before implements TaskListener{ queryWrapper1.isNull("TASK_ID"); queryWrapper1.orderByDesc("CREATE_TIME"); List list = busBean.list(queryWrapper1); + + JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class); + if(ideaList != null && !ideaList.isEmpty()){ + ideaList=new JSONArray(); + delegateTask.setVariable("ideaList",ideaList); + } if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId());