diff --git a/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java b/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java new file mode 100644 index 00000000..938ac8eb --- /dev/null +++ b/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java @@ -0,0 +1,11 @@ +package com.spring.modules.change.entity.APIEntity; + +import lombok.Data; + +import java.util.Map; + +@Data +public class DoForceDrawBackParam2 { + private String userId; + private String requestId; +} diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java index b586b77a..eb597682 100644 --- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java +++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java @@ -376,23 +376,31 @@ public class RequestManageServiceImpl extends ServiceImpl otherParams = new HashMap<>(); - // 如果当前登录人 != 当前节点审批人 就传 ismonitor - if (!data.getUserId().equals(inData.getUpdateBy())) { - otherParams.put("ismonitor", "1"); - } + otherParams.put("ismonitor", "1"); doForceDrawBackParam.setOtherParams(otherParams); String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack"; ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam); if (!"0".equals(doForceDrawBackResponses.getCode())) { throw new RuntimeException("强制收回流程异常信息:" + doForceDrawBackResponses.getMsg()); } -// } + } else { + DoForceDrawBackParam2 doForceDrawBackParam = new DoForceDrawBackParam2(); + doForceDrawBackParam.setUserId(userId); + doForceDrawBackParam.setRequestId(requestId); + String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack"; + ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam); + if (!"0".equals(doForceDrawBackResponses.getCode())) { + throw new RuntimeException("强制收回流程异常信息:" + doForceDrawBackResponses.getMsg()); + } + } + // 流程代办删除接口,删除发送的消息 DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam(); deleteUserRequestInfoParam.setUserId(userId);