diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index 7d8f719a..6533a9f9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -66,13 +66,10 @@ public class XmMenuService extends BaseService { public void batchInsertOrUpdate(List xmMenus) { List addList=new ArrayList<>(); List editList=new ArrayList<>(); - for (XmMenuVo vo : xmMenus) { - if("addSub".equals(vo.getOpType())||"add".equals(vo.getOpType())) { - addList.add(vo); - }else { - editList.add(vo); - } - } + List xmMenusDb=this.selectListByIds(xmMenus.stream().map(i->i.getMenuId()).collect(Collectors.toList())); + editList=xmMenus.stream().filter(i->xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList()); + addList=xmMenus.stream().filter(i->!xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList()); + List xmMenuList=new ArrayList<>(); if(addList.size()>0) { xmMenuList.addAll(addList.stream().map(i->(XmMenu)i).collect(Collectors.toList()));