Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -518,6 +518,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveOrgCode());
         manage.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
         manage.setAuditPassDate(new Date());
+        Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
@@ -616,7 +618,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         dto.setFlowStatusLabel(jgChangeVehicleRegistrationUnit.getStatus());
         dto.setStartUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
         dto.setStartUser(jgChangeVehicleRegistrationUnit.getCreateUserName());
-        dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getCreateUserName());
+        dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         dto.setStartDate(new Date());
         jgChangeVehicleRegistrationUnit.setInstanceId(workflowResultDto.getInstanceId());
         jgChangeVehicleRegistrationUnit.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());