diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 10dd061b31..d40bde2806 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -81,7 +81,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; -import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -2147,7 +2146,8 @@ public class CommonContractService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) { +// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) { + if ("销售专员申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");