diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 0e0f6dad5..6bb1dca71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -126,7 +126,7 @@ public class ProjectRelatedPersonnelController extends JeroController queryById(@RequestParam(name="projectId",required=true) String projectId) { - ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId); + List projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectId(projectId); if(projectRelatedPersonnel==null) { return Result.error("未找到对应数据"); } @@ -139,6 +139,8 @@ public class ProjectRelatedPersonnelController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, ProjectRelatedPersonnel.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java index 8ef6fb58f..763b57e52 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import java.util.List; import java.util.Map; /** @@ -16,5 +17,5 @@ public interface ProjectRelatedPersonnelMapper extends BaseMapper queryPageList(IPage page, Map params); - ProjectRelatedPersonnel queryByProjectId(String projectId); + List queryByProjectId(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index faa75c83e..2e19edebd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -52,7 +52,7 @@ public interface IProjectRelatedPersonnelService extends IService queryByProjectId(String projectId); /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 245df0551..165b9c488 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -94,9 +94,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryByProjectId(String projectId) { + List records = projectRelatedPersonnelMapper.queryByProjectId(projectId); + disposeData(records); + return records; } /** @@ -121,14 +122,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl result = projectRelatedPersonnelMapper.queryPageList(page, params); List records = result.getRecords(); - for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { - disposeData(projectRelatedPersonnel); - } + disposeData(records); return result; } - - public ProjectRelatedPersonnel disposeData(ProjectRelatedPersonnel projectRelatedPersonnel) { - + public void disposeData(List records) { + for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { //法规工程师 List lawEngineerUsers = new ArrayList<>(); List lawEngineerIdList = Arrays.asList(projectRelatedPersonnel.getLawEngineer().split(",")); @@ -218,7 +216,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl