Browse Source

修复合同审核的字段问题

master
dimengzhe 2 years ago
parent
commit
8eb1fdea52
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -1361,9 +1361,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean rb = ResultBean.fireFail();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
CommonContract commonContract = fetchBySid(dto.getContractSid());
commonContract.setStaffSid(dto.getUserSid());
commonContract.setStaffName(data.getStaffName());
commonContract.setOrgSid(data.getOrgSid());
// commonContract.setStaffSid(dto.getUserSid());
// commonContract.setStaffName(data.getStaffName());
// commonContract.setOrgSid(data.getOrgSid());
String s1 = "";
String s2 = "";
String s3 = "";
@ -2080,7 +2080,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getStaffSid())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");

Loading…
Cancel
Save