From 64f0ef24285518708ecb20a82d3cf38e424790e8 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期六, 15 一月 2022 08:33:30 +0800 Subject: [PATCH] 提交更新 --- src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java index 50d8a0f..efb12a6 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java @@ -46,7 +46,10 @@ @RequestParam(required = false) String orderByType, @RequestParam Map<String, Object> param) { String target = (String) param.get("items"); + String search = (String) param.get("id"); param.remove("items"); + param.remove("id"); + EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>(); if (target != null && !target.equals("0")){ wrapper.eq("item_id",target); @@ -60,6 +63,7 @@ } excludeTrash(param); convert(param, wrapper); + // HashSet<String> excludeItems = new HashSet<>(); // excludeItems.add("id"); // excludeItems.add("item_id"); @@ -71,10 +75,6 @@ // // allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id")); wrapper.orderBy("item_id"); -// if (!Cools.isEmpty(orderByField)) { -// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); -// } - return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper)); } -- Gitblit v1.9.1