|
|
@@ -751,6 +751,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
if (ptlAgreement.getData() != null && ptlAgreement.getData().getAgreement() != null) {
|
|
|
insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
|
|
|
insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
|
|
|
+ // 根据ptlAgreement获取deptId,根据deptId查询sys_dept,然后根据sys_dept的name给agreementAttributionName赋值
|
|
|
+ String deptId = ptlAgreement.getData().getAgreement().getDeptId();
|
|
|
+ if (StringUtils.isNotEmpty(deptId)) {
|
|
|
+ HttpResult<SysDeptVo> deptResult = orgClient.deptGet(deptId);
|
|
|
+ if (deptResult != null && deptResult.getData() != null) {
|
|
|
+ insOrdersVo.setAgreementOwnership(deptResult.getData().getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -910,6 +918,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
if (ptlAgreement.getData() != null && ptlAgreement.getData().getAgreement() != null) {
|
|
|
insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
|
|
|
insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
|
|
|
+
|
|
|
+ // 根据ptlAgreement获取deptId,根据deptId查询sys_dept,然后根据sys_dept的name给agreementAttributionName赋值
|
|
|
+ String deptId = ptlAgreement.getData().getAgreement().getDeptId();
|
|
|
+ if (StringUtils.isNotEmpty(deptId)) {
|
|
|
+ HttpResult<SysDeptVo> deptResult = orgClient.deptGet(deptId);
|
|
|
+ if (deptResult != null && deptResult.getData() != null) {
|
|
|
+ insOrdersVo.setAgreementOwnership(deptResult.getData().getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 2. 处理车辆用户信息列表
|