Commit ad615ef2 by guojuxing

批量同步测试菜单应用数据到生产,修复

parent 1f73002e
......@@ -683,13 +683,7 @@ public class MenuApiServiceImpl implements MenuApiService {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是应用对应的code");
}
//临时表(测试环境的菜单数据)
List<TabSysMenu> devMenuList;
if (tabSysMenu.getProject().equals("gic")) {
devMenuList = menuService.listMenuTempForGic(tabSysMenu.getMenuCode());
} else {
String appId = tabSysMenu.getProject();
devMenuList = menuService.listMenuTemp(appId);
}
List<TabSysMenu> devMenuList = menuService.listMenuTempForGic(tabSysMenu.getMenuCode());
if (CollectionUtils.isNotEmpty(devMenuList)) {
devMenuList.forEach(menu -> {
TabSysMenu temp = menuService.getMenuByMenuCode(menu.getMenuCode());
......@@ -705,6 +699,7 @@ public class MenuApiServiceImpl implements MenuApiService {
menu.setParentCode(tabSysMenu.getMenuCode());
menu.setMenuVersion(tabSysMenu.getMenuVersion());
menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
menu.setProject(tabSysMenu.getProject());
//避免冲突
menu.setMenuId(null);
menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));
......@@ -714,6 +709,7 @@ public class MenuApiServiceImpl implements MenuApiService {
menu.setParentId(otherLevel.getMenuId());
menu.setMenuVersion(tabSysMenu.getMenuVersion());
menu.setMenuVersionName(tabSysMenu.getMenuVersionName());
menu.setProject(tabSysMenu.getProject());
//避免冲突
menu.setMenuId(null);
menuService.savePage(EntityUtil.changeEntityNew(MenuDTO.class, menu));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment