fix(jg):三环车用气瓶认领 接口 修改

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/ShCarEquServiceImpl.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.ShCarEquMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IShCarEquService;
 import com.yeejoin.amos.boot.module.jg.api.vo.CarAndEquVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.ShCarEquVo;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -31,6 +32,9 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
     @Autowired
     ShCarServiceImpl shCarServiceImpl;
 
+    @Autowired
+    ICommonService commonService;
+
     /**
      * 分页查询
      */
@@ -58,7 +62,13 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
         shCarDto.setCompanyType(companyType);
         shCarDto.setUseUnitName(reginParams.getCompany().getCompanyName());
         shCarDto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-        shCarDto.setUseUnitAddress(reginParams.getCompany().getAddress());
+        String[] code = reginParams.getCompany().getCompanyCode().split("_");
+        String useUnitCode = code.length > 1 ? code[1] : code[0];
+        if ("个人主体".equals(companyType)) {
+            shCarDto.setUseUnitAddress((String) commonService.getEnterpriseInfo(useUnitCode).get("address"));
+        } else {
+            shCarDto.setUseUnitAddress(reginParams.getCompany().getAddress());
+        }
         shCarDto.setSafetyManagerId("个人主体".equals(companyType) ? userModel.getRealName() : null);
         shCarDto.setPhone("个人主体".equals(companyType) ? userModel.getMobile() : null);