diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index b3bd191..067f0c3 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -100,6 +100,7 @@ public class ProjectController extends BaseController { Map model) { //当前登录人的角色类型 model.put("keywords", keywords); + model.put("pageNumber", pageNumber); Admin admin = InterfaceUtil.getAdmin(); model.put("adminId", admin.getId()); model.put("admin", admin); @@ -620,6 +621,7 @@ public class ProjectController extends BaseController { */ @RequestMapping("/approve") public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords, + @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber, @RequestParam("id") int id, @RequestParam("type") int type,@RequestParam String listFrom, Map model) { Project project = projectService.getProject(id); @@ -701,6 +703,7 @@ public class ProjectController extends BaseController { } //结算信息 model.put("keywords",keywords); + model.put("pageNumber",pageNumber); ConcurrentHashMap searchInfo = getSearchInfo(keywords,model); String time; if (!searchInfo.containsKey("time")) { diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index e5e8f08..3fd11a8 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -112,6 +112,7 @@
+
    @@ -2836,7 +2837,7 @@
    - <#if adminId==project.approveId> @@ -2865,6 +2866,14 @@