修改企业注册

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
 import io.swagger.annotations.ApiModel;
@@ -123,5 +124,6 @@ public class RegUnitInfoDto  extends BaseDto {
 
     @ApiModelProperty(value = "平台用户id,平台创建用户后更新")
     private String adminUserId;
-    
+
+    JSONObject form;
 }

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

@@ -175,8 +175,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         // 电梯维保单位统一信用代码
         Elevator elevator = elevatorServiceImpl.selectByAlertId(alertId);
         MaintenanceUnit maintenanceUnit = iMaintenanceUnitService.getById(elevator.getMaintainUnitId());
-        dispatchPaper.setRepairOrgCreditCode(maintenanceUnit.getSocialCreditCode());
-
+        if(!ValidationUtil.isEmpty(maintenanceUnit)) {
+            dispatchPaper.setRepairOrgCreditCode(maintenanceUnit.getSocialCreditCode());
+        }
         this.save(dispatchPaper);
 
         // 根据类型创建动态表单信息

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

@@ -126,6 +126,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public RegUnitInfoDto registerUnit(RegUnitInfoDto model) {
+		if(ValidationUtil.isEmpty(model.getUnitCode())){
+			model.setUnitCode(model.getForm().getString("unitCode"));
+		}
 		RegUnitInfo regUnitInfo = new RegUnitInfo();
 		try {
 			tzsAuthServiceImpl.setRequestContext();