修改sql查询

src/main/java/com/roma/romaapi/dao/PageDao.java

@@ -35,9 +35,13 @@ public class PageDao {
     // 获取全部菜单项
     public List<Map<String, Object>> getMenuForList(){
         Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("type_action", "action");
-        String sql = " SELECT * FROM `admin_menu` WHERE `delete_time` IS NULL AND `type`!=:type_action ORDER BY `sort` ASC ";
+        paramMap.put("type_menu", "menu");
+        paramMap.put("type_dir", "dir");
+        String sql = " SELECT  `rp`.`id`,`rp`.`parent_id`,`rp`.`icon`,`rp`.`type`,`rp`.`value` AS `path`,`pd`.`front_path` AS `url`,`rp`.`display_name` AS `label` " +
+                "FROM `roma_permissions` AS `rp` LEFT JOIN `page_details` AS `pd` ON `pd`.`id`=`rp`.`page_id` " +
+                "WHERE `rp`.`is_enable`=1 AND (`rp`.`type`=:type_menu OR `rp`.`type`=:type_dir )  ORDER BY `rp`.`sort` ASC ";
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
+
         return resMap2;
     }
 }

src/main/java/com/roma/romaapi/service/PageService.java

@@ -38,9 +38,13 @@ public class PageService {
             tempMap.put("parent_id", map.get("parent_id"));
             tempMap.put("label", (String) map.get("label"));
             tempMap.put("icon", (String) map.get("icon"));
-            Object objectVisible = map.get("visible");
-            String stringVisible = objectVisible.toString();
-            boolean visible = stringVisible.equals("0") || stringVisible.equals("1");
+            boolean visible = true;
+            if (!map.containsKey("visible")) {
+            } else {
+                Object objectVisible = map.get("visible");
+                String stringVisible = objectVisible.toString();
+                visible = stringVisible.equals("0") || stringVisible.equals("1");
+            }
             tempMap.put("visible", visible);
             switch (menuType) {
                 case "menu": // 菜单