|
|
@@ -85,10 +85,11 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
|
|
|
SysOrg r = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(request.getBelongOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
|
|
|
request.setBelongOrgPath(r.getPath());
|
|
|
}
|
|
|
+ SysOrg topOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
|
|
|
|
|
|
Page<CoreDrillPlanPageVo> page = coreDrillPlanMapper.selectPageData(request.getPageRequest(), request);
|
|
|
for (CoreDrillPlanPageVo record : page.getRecords()) {
|
|
|
- dealData(record, page.getRecords(), request.getOrgId(), request);
|
|
|
+ dealData(record, page.getRecords(), topOrg.getId(), request);
|
|
|
}
|
|
|
//抓换为TableDataInfo适配前端
|
|
|
return TableDataInfo.build(page);
|