From 74eba49e13da44e619389083637098a030bd927d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 23 Apr 2024 21:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectEnterpriseController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java index 0e0f15ca0..667a1f054 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java @@ -91,10 +91,12 @@ public class ProjectEnterpriseController { List> list = new ArrayList<>(); for (EntityMap entityMap : pageList) { for (WorkerInfo workerInfo : workerInfoList) { - Map resultMap = new HashMap<>(); - resultMap.put("name", workerInfo.getWorkerName() + " —— " + entityMap.get("enterpriseName")); - resultMap.put("id", workerInfo.getId()); - list.add(resultMap); + if (workerInfo.getEnterpriseId().equals(entityMap.get("id"))) { + Map resultMap = new HashMap<>(); + resultMap.put("name", workerInfo.getWorkerName() + " —— " + entityMap.get("enterpriseName")); + resultMap.put("id", workerInfo.getId()); + list.add(resultMap); + } } } return Result.success(list);