FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 计划管控合并流程空指针修改

Browse Source
This commit is contained in:
wxyclub
2023-11-28 17:58:27 +08:00
parent 27e773f646
commit 7cb7ede855
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+4 -1
View File
@@ -269,6 +269,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
if(StringUtils.isNotBlank(mesg)){ if(StringUtils.isNotBlank(mesg)){
JSONObject jsonObject = JSON.parseObject(mesg); JSONObject jsonObject = JSON.parseObject(mesg);
String esIdMesg = jsonObject.getString("esId"); String esIdMesg = jsonObject.getString("esId");
if (StringUtils.isBlank(esIdMesg)) {
esIdMesg = jsonObject.getString("nowEsId");
}
if (StringUtils.isBlank(esIdMesg)) { if (StringUtils.isBlank(esIdMesg)) {
return false; return false;
} }
@@ -279,7 +282,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
String log = ""; String log = "";
if (busProcessNewList.size()>0) { if (busProcessNewList.size()>0) {
for (BusProcessNew busProcessNew : busProcessNewList) { for (BusProcessNew busProcessNew : busProcessNewList) {
webServiceOAService.deleteOAByPid(busProcessNew.getPId()); // webServiceOAService.deleteOAByPid(busProcessNew.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(busProcessNew.getPId()).singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(busProcessNew.getPId()).singleResult();
if (processInstance != null) { if (processInstance != null) {
runtimeService.deleteProcessInstance(busProcessNew.getPId(), "原始数据已被更改"); runtimeService.deleteProcessInstance(busProcessNew.getPId(), "原始数据已被更改");
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
-1
View File
@@ -193,7 +193,6 @@ public class BussUtils {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+1 -1
View File
@@ -478,7 +478,7 @@ public class ProcessStep4After implements TaskListener {
} }
} }
if(!"5".equals(type)){ if(!"5".equals(type)){
delegateTask.setVariable("bzfgbzFlag",2); // delegateTask.setVariable("bzfgbzFlag",2);
BussUtils.endFunAll(delegateTask, prcName, busBean, object, "0", busProcessNameService, "25"); BussUtils.endFunAll(delegateTask, prcName, busBean, object, "0", busProcessNameService, "25");
} }
} }