Commit 30c76eff authored by zoujintao's avatar zoujintao

修复部门员工表分页问题

parent 02454e6f
...@@ -53,11 +53,7 @@ ...@@ -53,11 +53,7 @@
<pattern>/basetree/transferNode</pattern> <pattern>/basetree/transferNode</pattern>
</decorator> </decorator>
<decorator name="userSiteMesh" page="userSiteMesh.jsp">
<pattern>/user/authorize*</pattern>
<pattern>/user/form*</pattern>
<pattern>/user/list*</pattern>
</decorator>
<decorator name="userDetailSiteMesh" page="default.jsp"> <decorator name="userDetailSiteMesh" page="default.jsp">
<pattern>/user/detail*</pattern> <pattern>/user/detail*</pattern>
...@@ -66,6 +62,10 @@ ...@@ -66,6 +62,10 @@
<pattern>/user/pbform*</pattern> <pattern>/user/pbform*</pattern>
</decorator> </decorator>
<decorator name="userSiteMesh" page="userSiteMesh.jsp">
<pattern>/user/*</pattern>
</decorator>
<decorator name="deptSiteMesh" page="userSiteMesh.jsp"> <decorator name="deptSiteMesh" page="userSiteMesh.jsp">
<pattern>/department/update*</pattern> <pattern>/department/update*</pattern>
<pattern>/basetree/update*</pattern> <pattern>/basetree/update*</pattern>
......
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
<div class="row${fluid}"> <div class="row${fluid}">
<div class="span12"> <div class="span12">
<form id="filterForm" class="form-inline filterForm" action="${ctx}/user/" method="get"> <form id="filterForm" class="form-inline filterForm" action="${ctx}/user/" method="get">
<%--<input type="hidden" name="search_EQ_deptId" value="${sessionTreeDept}"--%> <input type="hidden" name="search_EQ_deptId" value="${sessionTreeDept}"
<%--class="m-wrap small span2" placeholder="deptId">--%> class="m-wrap small span2" placeholder="deptId">
<%--<input type="text" name="search_EQ_id" value="${param['search_EQ_id']}"--%> <%--<input type="text" name="search_EQ_id" value="${param['search_EQ_id']}"--%>
<%--class="m-wrap small span2" placeholder="用户ID">--%> <%--class="m-wrap small span2" placeholder="用户ID">--%>
<input type="text" name="search_LIKE_name" value="${param['search_LIKE_name']}" <input type="text" name="search_LIKE_name" value="${param['search_LIKE_name']}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment