|
|
@@ -41,7 +41,7 @@ public class PageDao {
|
|
|
String sql= " SELECT `rp`.`is_visible`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon` as `icon`,`rp`.`object_type`," +
|
|
|
"`rp`.`object_id`,`pd`.`page_code` AS `path`,`pd`.`front_path` AS `url`,`rp`.`menu_name` AS `label` " +
|
|
|
"FROM `roma_permissions` AS `rp` LEFT JOIN `page_details` AS `pd` ON `pd`.`id`=`rp`.`object_id` " +
|
|
|
- "WHERE `rp`.`is_enable`=1 and `rp`.`is_menu`=1 ORDER BY `rp`.`permission_sort` ASC ";
|
|
|
+ "WHERE `rp`.`is_enable`=1 and `rp`.`object_type`='page' ORDER BY `rp`.`permission_sort` ASC ";
|
|
|
List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
|
|
|
|
|
|
return resMap2;
|
|
|
@@ -51,7 +51,7 @@ public class PageDao {
|
|
|
public List<Map<String, Object>> getAllMenuForList(){
|
|
|
Map<String, Object> paramMap = new HashMap<>();
|
|
|
String sql = " SELECT `rp`.`is_enable`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon`,`rp`.`object_type`," +
|
|
|
- "`rp`.`object_id`,`rp`.`is_menu`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
|
|
|
+ "`rp`.`object_id`,`rp`.`is_dir`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
|
|
|
"WHERE 1=1 ORDER BY `rp`.`permission_sort` ASC";
|
|
|
List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
|
|
|
|
|
|
@@ -62,7 +62,7 @@ public class PageDao {
|
|
|
public List<Map<String, Object>> getPageMenuForList(){
|
|
|
Map<String, Object> paramMap = new HashMap<>();
|
|
|
String sql = " SELECT `pd`.`page_code`,`pd`.`page_name`,`rp`.`is_enable`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon`,`rp`.`object_type`," +
|
|
|
- "`rp`.`object_id`,`rp`.`is_menu`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
|
|
|
+ "`rp`.`object_id`,`rp`.`is_dir`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
|
|
|
" LEFT JOIN `page_details` as `pd` ON `pd`.`id`=`rp`.`object_id` " +
|
|
|
"WHERE 1=1 ORDER BY `rp`.`permission_sort` ASC";
|
|
|
List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
|