菜单管理的搜索条件的完善

src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java

@@ -20,6 +20,7 @@ import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -95,21 +96,8 @@ public class MenuController extends BaseController {
      */
      */
     @RequestMapping(value = "/list")
     @RequestMapping(value = "/list")
     @ResponseBody
     @ResponseBody
-    public Object list() {
-        List<Map<String, Object>> menus = this.menuDao.selectMenus(null);
-        return super.warpObject(new MenuWarpper(menus));
-    }
-
-    /**
-     * 获取菜单列表
-     */
-    @RequestMapping(value = "/list/{condition}")
-    @ResponseBody
-    public Object list(@PathVariable String condition) {
-        if (ToolUtil.isEmpty(condition)) {
-            throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
-        }
-        List<Map<String, Object>> menus = this.menuDao.selectMenus(condition);
+    public Object list(@RequestParam(required = false) String menuName) {
+        List<Map<String, Object>> menus = this.menuDao.selectMenus(menuName);
         return super.warpObject(new MenuWarpper(menus));
         return super.warpObject(new MenuWarpper(menus));
     }
     }
 
 

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuDao.xml

@@ -14,7 +14,7 @@
 		from _menu
 		from _menu
 		where status = 1
 		where status = 1
 		<if test="condition != null and condition != ''">
 		<if test="condition != null and condition != ''">
-			and name = #{condition}
+			and (name like CONCAT('%',#{condition},'%') or code like CONCAT('%',#{condition},'%'))
 		</if>
 		</if>
 	</select>
 	</select>
 
 

src/main/webapp/WEB-INF/view/system/menu/menu.html

@@ -13,7 +13,7 @@
                                 <#NameCon id="menuName" name="菜单名称" />
                                 <#NameCon id="menuName" name="菜单名称" />
                             </div>
                             </div>
                             <div class="col-sm-3">
                             <div class="col-sm-3">
-                                <#button name="搜索" icon="fa-search" clickFun="search()"/>
+                                <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
                             </div>
                             </div>
                         </div>
                         </div>
                         <div class="hidden-xs" id="menuTableToolbar" role="group">
                         <div class="hidden-xs" id="menuTableToolbar" role="group">

src/main/webapp/static/modular/system/menu/menu.js

@@ -93,6 +93,17 @@ Menu.delMenu = function(){
 	}
 	}
 };
 };
 
 
+/**
+ * 搜索
+ */
+Menu.search = function(){
+    var queryData = {};
+
+    queryData['menuName'] = $("#menuName").val();
+
+    Menu.table.refresh({query: queryData});
+}
+
 $(function(){
 $(function(){
 	var defaultColunms = Menu.initColumn();
 	var defaultColunms = Menu.initColumn();
 	var table = new BSTable(Menu.id,"/menu/list",defaultColunms);
 	var table = new BSTable(Menu.id,"/menu/list",defaultColunms);