2 éve · 4c2ec98cdb
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/controller/page/MenuPageController.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/controller/page/MenuPageController.java
@@ -31,12 +31,12 @@ public class MenuPageController {
 
				 
			
 
				     @ApiOperation(value = "资源列表页面")
			
 
				     @GetMapping
			
 
				-    public String menuPage(@RequestParam(value = "isEnabled", required = false) Boolean isEnabled, Model model) {
			
 
				-        if (isEnabled == null) {
			
 
				-            isEnabled = true;
			
 
				+    public String menuPage(@RequestParam(value = "enabled", required = false) Boolean enabled, Model model) {
			
 
				+        if (enabled == null) {
			
 
				+            enabled = true;
			
 
				         }
			
 
				 
			
 
				-        model.addAttribute("isEnabled", isEnabled);
			
 
				+        model.addAttribute("enabled", enabled);
			
 
				         return "/rbac/menu/index";
			
 
				     }
			
 
				 
			
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/MenuQueryImpl.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/db/query/MenuQueryImpl.java
@@ -31,7 +31,7 @@ public class MenuQueryImpl implements MenuQuery {
 
				 
			
 
				     @Override
			
 
				     public List<Menu> getSortedMenusByStatus(Boolean isEnabled) {
			
 
				-        List<Menu> menuList = menuRepository.findByIsEnabled(isEnabled);
			
 
				+        List<Menu> menuList = menuRepository.findByEnabled(isEnabled);
			
 
				         Map<Integer, List<Menu>> map =  menuList.stream().collect(Collectors.groupingBy(Menu::getPid));
			
 
				         List<Menu> list = new ArrayList<>();
			
 
				         map.forEach((pid, menus) -> {
			
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/db/repository/MenuRepository.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/db/repository/MenuRepository.java
@@ -11,5 +11,5 @@ import java.util.List;
 
				  */
			
 
				 public interface MenuRepository extends JpaRepository<Menu, Integer> {
			
 
				     List<Menu> findByPid(int pid);
			
 
				-    List<Menu> findByIsEnabled(boolean isEnabled);
			
 
				+    List<Menu> findByEnabled(boolean isEnabled);
			
 
				 }
			
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/MenuAddDTO.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/model/dto/MenuAddDTO.java
@@ -38,7 +38,7 @@ public class MenuAddDTO implements Serializable {
 
				         menu.setIcon("layui-icon layui-icon-face-smile");
			
 
				         menu.setPid(this.getPid());
			
 
				         menu.setPos(this.getPos());
			
 
				-        menu.setIsEnabled(true);
			
 
				+        menu.setEnabled(true);
			
 
				         return menu;
			
 
				     }
			
 
				 }
			
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Menu.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/model/po/Menu.java
@@ -38,7 +38,8 @@ public class Menu extends BaseEntity {
 
				     // 在同一个 pid 组内的位置，作为排序使用
			
 
				     @NotNull
			
 
				     private Integer pos;
			
 
				-    private Boolean isEnabled;
			
 
				+    //private Boolean isEnabled;
			
 
				+    private Boolean enabled;
			
 
				     // Menu 拥有的所有子 Menu(按排序顺序, 不持久化)
			
 
				     @Transient
			
 
				     private Map<Integer, Menu> children;
			
--- a/manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/MenuServiceImpl.java
+++ b/manager/src/main/java/cn/reghao/devops/manager/rbac/service/impl/MenuServiceImpl.java
@@ -40,7 +40,7 @@ public class MenuServiceImpl implements MenuService {
 
				 
			
 
				         // 调整 menu 组内元素的位置
			
 
				         insertNewMenu(menu);
			
 
				-        menu.setIsEnabled(true);
			
 
				+        menu.setEnabled(true);
			
 
				         Menu menuEntity = menuRepository.save(menu);
			
 
				 
			
 
				         //Set<Role> roles = menu.getRoles();
			
--- a/manager/src/main/resources/templates/rbac/menu/index.html
+++ b/manager/src/main/resources/templates/rbac/menu/index.html
@@ -5,7 +5,7 @@
 
				         <link rel="stylesheet" th:href="@{/lib/zTree_v3/css/zTreeStyle/zTreeStyle.css}" type="text/css">
			
 
				     </head>
			
 
				     <body class="timo-layout-page">
			
 
				-        <div class="layui-card timo-tree" th:attr="data-url=@{'/api/rbac/menu/' + ${isEnabled}}">
			
 
				+        <div class="layui-card timo-tree" th:attr="data-url=@{'/api/rbac/menu/' + ${enabled}}">
			
 
				             <div class="layui-card-header timo-card-header">
			
 
				                 <span>
			
 
				                     <i class="fa fa-bars"></i>
			
@@ -28,8 +28,8 @@
 
				                             <div class="layui-inline">
			
 
				                                 <label class="layui-form-label">状态</label>
			
 
				                                 <div class="layui-input-block timo-search-status">
			
 
				-                                    <select id="getByStatus" class="timo-search-select" name="isEnabled" onchange="getListByStatus()"
			
 
				-                                            mo:dict="MENU_STATUS" mo-selected="${isEnabled}"></select>
			
 
				+                                    <select id="getByStatus" class="timo-search-select" name="enabled" onchange="getListByStatus()"
			
 
				+                                            mo:dict="MENU_STATUS" mo-selected="${enabled}"></select>
			
 
				                                 </div>
			
 
				                             </div>
			
 
				                         </div>
			
@@ -116,7 +116,7 @@
 
				             function getListByStatus() {
			
 
				                 var selectedOption = $("#getByStatus option:selected")
			
 
				                 var param = selectedOption.text()
			
 
				-                url = '?isEnabled=' + param
			
 
				+                url = '?enabled=' + param
			
 
				                 window.location.href = window.location.pathname + url;
			
 
				             }
			
 
				         </script>