Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -123,7 +123,7 @@ public class ContractServiceImpl implements ContractService {
 		KObject kobject = contractDao.load(id);
 		KObject regionalCompany = kobject.get("regionalCompany");
 		Map <String,Object> params = new HashMap();
-		params.put("regionalCompanyCode", regionalCompany.getString("code"));
+//		params.put("regionalCompanyCode", regionalCompany.getString("code"));//code并不是必填的，这个值为空的话，工作流提交会报错
 		params.put("regionalCompanyName", regionalCompany.getString("name"));
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"SUBMIT")) {
 			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);
@@ -139,7 +139,7 @@ public class ContractServiceImpl implements ContractService {
 		KObject kobject = contractDao.load(id);
 		KObject regionalCompany = kobject.get("regionalCompany");
 		Map <String,Object> params = new HashMap();
-		params.put("regionalCompanyCode", regionalCompany.getString("code"));
+//		params.put("regionalCompanyCode", regionalCompany.getString("code"));
 		params.put("regionalCompanyName", regionalCompany.getString("name"));
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"CHANGE")) {
 			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE_UPDATE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);