推送单据修改;菜单查询优化;
This commit is contained in:
+5
@@ -110,6 +110,9 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
|
||||
businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
|
||||
businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
|
||||
businessDataPushDTO.setDataSources(1);
|
||||
|
||||
businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
|
||||
businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
|
||||
bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
|
||||
}
|
||||
log.info("定时任务整租推送到bms触发--结束");
|
||||
@@ -156,6 +159,8 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
|
||||
businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
|
||||
businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
|
||||
businessDataPushDTO.setDataSources(1);
|
||||
businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
|
||||
businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
|
||||
bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-4
@@ -575,21 +575,23 @@ public class MenuApplicationService {
|
||||
navigationProduct = sysProductDomainService.getNavigationProduct(navigationMenu, longs, tenantsId);
|
||||
}
|
||||
//获取菜单类型
|
||||
List<Menu> menus = menuMapper.selectList(null);
|
||||
for (NavigationVo navigationVo : navigationProduct) {
|
||||
getMenuType(navigationVo);
|
||||
getMenuType(navigationVo, menus);
|
||||
}
|
||||
return navigationProduct;
|
||||
}
|
||||
private NavigationVo getMenuType(NavigationVo navigationVo) {
|
||||
private NavigationVo getMenuType(NavigationVo navigationVo,List<Menu> menus) {
|
||||
Long id = navigationVo.getId();
|
||||
Menu menu = menuMapper.selectById(id);
|
||||
Menu menu = menus.stream().filter(m -> m.getMenuId().equals(id)).findFirst().orElse(null);
|
||||
//Menu menu = menuMapper.selectById(id);
|
||||
if (menu != null) {
|
||||
navigationVo.setMenuType(menu.getMenuType());
|
||||
}
|
||||
List<NavigationVo> children = navigationVo.getChildren();
|
||||
if (children != null && children.size() > 0) {
|
||||
for (NavigationVo child : children) {
|
||||
getMenuType(child);
|
||||
getMenuType(child,menus);
|
||||
}
|
||||
}
|
||||
return navigationVo;
|
||||
|
||||
Reference in New Issue
Block a user