p批量同步测试数据到生产修复

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -675,6 +675,8 @@ public class MenuApiServiceImpl implements MenuApiService {
                         menu.setParentCode(tabSysMenu.getMenuCode());
                         menu.setMenuVersion(tabSysMenu.getMenuVersion());
                         menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
+                        //避免冲突
+                        menu.setMenuId(null);
                         menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));
                     } else {
                         //其他层级,查询他的父级ID，根据父级code
@@ -682,6 +684,8 @@ public class MenuApiServiceImpl implements MenuApiService {
                         menu.setParentId(otherLevel.getMenuId());
                         menu.setMenuVersion(tabSysMenu.getMenuVersion());
                         menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
+                        //避免冲突
+                        menu.setMenuId(null);
                         menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));
                     }
                 }