| 
															
																@ -71,7 +71,7 @@ public class BaseMenuManageService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    } 
															 | 
															
															 | 
															
																    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    //菜单词典查询 
															 | 
															
															 | 
															
																    //菜单词典查询 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public List<Map<String,Object>> findMenuDictByKey(String parentId, String name){ 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    public List<Map<String,Object>> findMenuDictByKey(String parentId, String name,Integer status){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        String sql = "select t.id as \"id\", " + 
															 | 
															
															 | 
															
																        String sql = "select t.id as \"id\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " t.parent_id as \"parentId\", " + 
															 | 
															
															 | 
															
																                " t.parent_id as \"parentId\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " t.name as \"name\", " + 
															 | 
															
															 | 
															
																                " t.name as \"name\", " + 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -118,6 +118,11 @@ public class BaseMenuManageService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            sql+=" and t.name like '%"+name+"%'"; 
															 | 
															
															 | 
															
																            sql+=" and t.name like '%"+name+"%'"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            sqlParent+=" and t.name like '%"+name+"%'"; 
															 | 
															
															 | 
															
																            sqlParent+=" and t.name like '%"+name+"%'"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        if (status!=null){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            sql += " and t.status = '"+status+"' "; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            sqlParent+=" and t.status = '"+status+"' " ; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        sql+=" order by t.parent_id asc ,t.menu_sort asc "; 
															 | 
															
															 | 
															
																        sql+=" order by t.parent_id asc ,t.menu_sort asc "; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql); 
															 | 
															
															 | 
															
																        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String,Object>> listParent = hibenateUtils.createSQLQuery(sqlParent); 
															 | 
															
															 | 
															
																        List<Map<String,Object>> listParent = hibenateUtils.createSQLQuery(sqlParent); 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -483,11 +488,21 @@ public class BaseMenuManageService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " m.bg_img as \"bgImg\"," + 
															 | 
															
															 | 
															
																                " m.bg_img as \"bgImg\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " m.menu_title as \"menuTitle\"," + 
															 | 
															
															 | 
															
																                " m.menu_title as \"menuTitle\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " m.describtion as \"describtion\"," + 
															 | 
															
															 | 
															
																                " m.describtion as \"describtion\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " t.style_name as \"styleName\" " + 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                " t.style_name as \"styleName\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                " m.parent_id as \"parentId\" " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " from base_menu_show t left join " + 
															 | 
															
															 | 
															
																                " from base_menu_show t left join " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " base_menu_dict m on t.menu_id= m.id" + 
															 | 
															
															 | 
															
																                " base_menu_dict m on t.menu_id= m.id" + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " where t.is_del ='1' order by t.model_id asc ,t.menu_sort asc "; 
															 | 
															
															 | 
															
																                " where t.is_del ='1' order by t.model_id asc ,t.menu_sort asc "; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql); 
															 | 
															
															 | 
															
																        List<Map<String,Object>> list=hibenateUtils.createSQLQuery(sql); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        for (Map<String,Object> map:list){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            if (map.get("parentId")!=null){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                String parentId = map.get("parentId").toString(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                BaseMenuDictDO parentDo= baseMenuDictDao.findOne(parentId); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                if (parentDo!=null){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    map.put("parentName",parentDo.getName()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        String sqlLink =" select t.id as \"id\", " + 
															 | 
															
															 | 
															
																        String sqlLink =" select t.id as \"id\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " t.model_id as \"modelId\", " + 
															 | 
															
															 | 
															
																                " t.model_id as \"modelId\", " + 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -519,6 +534,7 @@ public class BaseMenuManageService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("childList",child); 
															 | 
															
															 | 
															
																                map.put("childList",child); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        return listModel; 
															 | 
															
															 | 
															
																        return listModel; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    } 
															 | 
															
															 | 
															
																    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 |