Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -115,19 +115,13 @@ public class ActTaskController extends BaseController {
 		Page<org.activiti.engine.repository.Model> page2 = actModelService.modelList(
 				new Page<org.activiti.engine.repository.Model>(request, response), "");
 		List<org.activiti.engine.repository.Model> list2 = page2.getList();
-		List a = new ArrayList();
-		a.add("全部流程");
-		for (org.activiti.engine.repository.Model newList : list2) {
-			String name = newList.getName();
-			a.add(name);
-		}
-		model.addAttribute("act", a);
+		model.addAttribute("act", list2);
 		return "modules/bpm/task/todo/taskTodoList";
 	}
 
 	@ResponseBody
 	@RequestMapping(value = "todo/data")
-	public  Map<String, Object> todoListData(Act act, HttpServletRequest request,HttpServletResponse response, Model model) throws Exception {
+	public  Map<String, Object> todoListData(Act act, HttpServletRequest request,HttpServletResponse response, Model model,String nameSelect) throws Exception {
 		Page<HashMap<String,String>> page = actTaskService.todoList(new  Page<HashMap<String,String>>(request, response),act);
 		return getBootstrapData(page);
 	}

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -1,7 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
-	var name = $("#empty").val();
+	var nameSelect = "";
 	$('#actTable').bootstrapTable({
 		 
 		  //请求方法
@@ -38,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/act/task/todo/data?",
+               url: "${ctx}/act/task/todo/data?nameSelect="+nameSelect,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -125,12 +125,15 @@ $(document).ready(function() {
 		  
 
 	  $("#search").click("click", function() {// 绑定查询按扭
+		  nameSelect = $("#nameSelect").val();
+		  console.log(nameSelect);
 		  $('#actTable').bootstrapTable('refresh');
 		});
 	 
 	 $("#reset").click("click", function() {// 绑定查询按扭
 		  $("#searchForm  input").val("");
-		  $("#searchForm  select").val("");
+		  // $("#searchForm  select").val("");
+		 $("#nameSelect").val("");
 		  $("#searchForm  .select-item").html("");
 		  $('#actTable').bootstrapTable('refresh');
 		});

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.jsp

@@ -23,8 +23,14 @@
 			<form:form id="searchForm" modelAttribute="act" class="form form-horizontal well clearfix">
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 				<label class="label-item single-overflow pull-left" title="流程名称：">流程名称：</label>
-				<form:select path="empty"  items="${act}"  class="form-control m-b">
-				</form:select>
+				 <select name="nameSelect" id="nameSelect" class="form-control">
+					 <option value="" selected="selected">全部选项</option>
+					 <c:forEach var="act" items="${act}">
+						<option value="${act.name}">${act.name}</option>
+					 </c:forEach>
+				 </select>
+<%--				<form:select path="empty"  items="${act}"  class="form-control m-b">--%>
+<%--				</form:select>--%>
 			</div>
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 				 <div class="form-group">