Commit 12b795e6 by guojuxing

应用版本菜单如果没有版本号数据,进行判空逻辑

parent 8f052e2b
......@@ -238,8 +238,8 @@ public class MenuController {
if (StringUtils.isNotBlank(dto.getMenuVersion())) {
String menuVersion = dto.getMenuVersion().substring(1, dto.getMenuVersion().length() - 1);
vo.setMenuVersion(menuVersion.replaceAll(SignConstants.UNDERLINE, SignConstants.COMMA));
vo.setMap(getMenuVersionMap(result.getResult()));
}
vo.setMap(getMenuVersionMap(result.getResult()));
}
return RestResponse.success(vo);
}
......@@ -293,10 +293,12 @@ public class MenuController {
} else {
String menuVersion = dto.getMenuVersion();
String menuVersionName = dto.getMenuVersionName();
String[] menuVersionArr = menuVersion.substring(1, menuVersion.length() - 1).split(SignConstants.UNDERLINE);
String[] menuVersionNameArr = menuVersionName.split(SignConstants.SLASH);
for (int i = 0, len = menuVersionArr.length; i < len; i++) {
map.put(menuVersionArr[i], menuVersionNameArr[i]);
if (StringUtils.isNotBlank(menuVersion)) {
String[] menuVersionArr = menuVersion.substring(1, menuVersion.length() - 1).split(SignConstants.UNDERLINE);
String[] menuVersionNameArr = menuVersionName.split(SignConstants.SLASH);
for (int i = 0, len = menuVersionArr.length; i < len; i++) {
map.put(menuVersionArr[i], menuVersionNameArr[i]);
}
}
}
return map;
......
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