契约锁2.0配置整理-发起方为深圳时,如果设置接收方,接收方信息会覆盖发起方信息;会EMPLOYEE NOT FOUND,找不到员工

This commit is contained in:
zhanglei 2021-01-07 13:55:33 +08:00
parent b62610dbc7
commit 140d4bb7a1

View File

@ -525,7 +525,6 @@ public class ContractSignVtwoUtils {
private Signatory createCompanySignatory(String subjectId){
Signatory signatory = new Signatory();
signatory.setReceiver(new User("12599996666", "MOBILE"));
signatory.setTenantType(SignatoryTypeEnum.PARENT_COMPANY.getType());//签署方类型COMPANY公司PERSONAL个人
Action action = new Action();
action.setType(SignatoryTypeEnum.PARENT_COMPANY.getType());
@ -579,7 +578,7 @@ public class ContractSignVtwoUtils {
for(SignatoryVo signatoryVo : signatories) {
if (SignatoryTypeEnum.PARENT_COMPANY.getType().equals(signatoryVo.getSignatoryType())) {//公司信息
//个人信息转化
Signatory signatory = signatoryCompanyInit(signatoryVo);
Signatory signatory = signatoryCompanyInit(signatoryVo, subjectId);
list.add(signatory);
}
}
@ -607,11 +606,13 @@ public class ContractSignVtwoUtils {
* @return
* @throws Exception
*/
private Signatory signatoryCompanyInit(SignatoryVo signatoryVo) throws Exception{
private Signatory signatoryCompanyInit(SignatoryVo signatoryVo, String subjectId) throws Exception{
Signatory companySignatory = new Signatory();
companySignatory.setTenantType(signatoryVo.getSignatoryType());
companySignatory.setTenantName(signatoryVo.getName());
companySignatory.setReceiver(new User(signatoryVo.getSignatorySubType(), signatoryVo.getMobile(), "MOBILE"));
if(!MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){
companySignatory.setReceiver(new User(signatoryVo.getSignatorySubType(), signatoryVo.getMobile(), "MOBILE"));
}
companySignatory.setActions(signatoryVo.getActions());
return companySignatory;
}