Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
This commit is contained in:
commit
97ae1766e8
@ -255,6 +255,9 @@ public class MenuServiceImpl implements MenuService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 如果 id 为空,说明不用比较是否为相同 id 的菜单
|
// 如果 id 为空,说明不用比较是否为相同 id 的菜单
|
||||||
|
if (id == null) {
|
||||||
|
throw exception(MENU_NAME_DUPLICATE);
|
||||||
|
}
|
||||||
if (!menu.getId().equals(id)) {
|
if (!menu.getId().equals(id)) {
|
||||||
throw exception(MENU_NAME_DUPLICATE);
|
throw exception(MENU_NAME_DUPLICATE);
|
||||||
}
|
}
|
||||||
@ -277,7 +280,7 @@ public class MenuServiceImpl implements MenuService {
|
|||||||
}
|
}
|
||||||
// 如果 id 为空,说明不用比较是否为相同 id 的菜单
|
// 如果 id 为空,说明不用比较是否为相同 id 的菜单
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
return;
|
throw exception(MENU_COMPONENT_NAME_DUPLICATE);
|
||||||
}
|
}
|
||||||
if (!menu.getId().equals(id)) {
|
if (!menu.getId().equals(id)) {
|
||||||
throw exception(MENU_COMPONENT_NAME_DUPLICATE);
|
throw exception(MENU_COMPONENT_NAME_DUPLICATE);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user