Commit 228a98ff authored by 麻笑宇's avatar 麻笑宇

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 541d20d0 b40b846b
...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto; ...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
import com.yeejoin.amos.component.feign.utils.FeignUtil; import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -131,8 +132,11 @@ public class JgEquipTransferController extends BaseController { ...@@ -131,8 +132,11 @@ public class JgEquipTransferController extends BaseController {
String companyName = companyModels.get(0).getCompanyName(); String companyName = companyModels.get(0).getCompanyName();
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
if ("个人主体".equals(companyType)) { if ("个人主体".equals(companyType)) {
AgencyUserModel userModel = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByUserId(RequestContext.getExeUserId()));
map.put("useUnitName", companyName.split("_")[1]); map.put("useUnitName", companyName.split("_")[1]);
map.put("useUnitCreditCode", companyCode.split("_")[1]); map.put("useUnitCreditCode", companyCode.split("_")[1]);
map.put("phone", userModel.getMobile());
map.put("sequenceNbr", userModel.getSequenceNbr());
map.put("companyType", "person"); map.put("companyType", "person");
} else { } else {
map.put("useUnitName", companyName); map.put("useUnitName", companyName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment