diff --git a/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/model/vo/MenuVo.java b/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/model/vo/MenuVo.java index 81ac1547c1f5114d0d621470315b67b4323128be..cfd055d3e3aa73731fece3710d1eaabc82005431 100644 --- a/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/model/vo/MenuVo.java +++ b/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/model/vo/MenuVo.java @@ -26,7 +26,7 @@ public class MenuVo extends BaseEntityLong { private Integer type; /** - * 鏄惁閫変腑锛�0涓洪€変腑锛�1閫変腑銆傞粯璁�0 + * 鏄惁閫変腑锛�0涓烘湭閫変腑锛�1閫変腑銆傞粯璁�0 */ - private Integer checked=0; + private Integer checked; } \ No newline at end of file diff --git a/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java b/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java index ed3e0a8f692e4bf5bf00a59746d2d5ea646a9965..7b48a6f74aa445f5f76b36f9297d65fdd241d20c 100644 --- a/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java +++ b/bill-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java @@ -247,18 +247,25 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity */ private void recursionFn(List<MenuEntity> list, MenuEntity t, Set<Long> menuIdsChecked) { // 寰楀埌瀛愯妭鐐瑰垪琛� + updateChecked(menuIdsChecked, t); List<MenuEntity> childList = getChildList(list, t); t.setChildren(childList); for (MenuEntity tChild : childList) { - if (menuIdsChecked.contains(tChild.getId())) { - tChild.setChecked(YesNoEnum.YES.getValue()); - } + updateChecked(menuIdsChecked, tChild); if (hasChild(list, tChild)) { recursionFn(list, tChild, menuIdsChecked); } } } + private void updateChecked(Set<Long> menuIdsChecked, MenuEntity menu) { + if (menuIdsChecked.contains(menu.getId())) { + menu.setChecked(YesNoEnum.YES.getValue()); + } else { + menu.setChecked(YesNoEnum.NO.getValue()); + } + } + @Override protected void removeBefore(Long[] ids, Context context) throws AppException { //鏈夊瓙鑺傜偣 绂佹鍒犻櫎 diff --git a/bill-manager/src/test/java/com/mortals/httpclient/http-client.env.json b/bill-manager/src/test/java/com/mortals/httpclient/http-client.env.json index 1b1720185c748768734e45bfab783b7bb80486cc..53191d134456e7717a782ee08d6592c710febfd2 100644 --- a/bill-manager/src/test/java/com/mortals/httpclient/http-client.env.json +++ b/bill-manager/src/test/java/com/mortals/httpclient/http-client.env.json @@ -4,7 +4,7 @@ "baseLogin": "http://127.0.0.1:18222/m" }, "test": { - "baseUrl": "http://8.136.255.30:11078/bill", + "baseUrl": "http://192.168.0.250:11078/bill", "baseLogin": "http://192.168.0.98:11078/base" }, diff --git a/bill-manager/src/test/java/com/mortals/httpclient/system.http b/bill-manager/src/test/java/com/mortals/httpclient/system.http index d1fcb661fcc9a527587e00ecf0d7bf8a705bd306..8ba0d2f9bbb0261734fe4853e0af1e3cdd863e4a 100644 --- a/bill-manager/src/test/java/com/mortals/httpclient/system.http +++ b/bill-manager/src/test/java/com/mortals/httpclient/system.http @@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login Content-Type: application/json { - "loginName":"xinhx", - "password":"xhxADMIN8@a" + "loginName":"admin", + "password":"admin" } > {% @@ -101,6 +101,16 @@ Content-Type: application/json } +###閽堝鏌愪竴鎺ュ叆 +POST {{baseUrl}}/role/auth/editMenu +Authorization: {{authToken}} +Content-Type: application/json + +{ + "roleId": 2 +} + +