merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 src/main/java/com/highdatas/mdm/controller/MenuMappingController.java

@@ -91,14 +91,17 @@
        String menuId = menuMapping.getMenuId();
        SysMenu menu = menuService.selectById(menuId);
        String preParentId = menu.getParentId();
        menu.setName(menuMapping.getName()).updateById();

        String themeId = menuMapping.getThemeId();
//        if (!preParentId.equalsIgnoreCase(themeId)) {
////            menu.setParentId(themeId);
////            menu.updateById();
////        }
        if (!preParentId.equalsIgnoreCase(themeId)) {
            menu.setParentId(themeId);
            menu.updateById();
        }
        boolean updated = menuMapping.updateById();
        if (updated) {



            TUser user = DbUtils.getUser(request);
            if (menu != null) {
                LinkedHashSet<String> parentIdSet = new LinkedHashSet<>();