diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java index 4f3522c75..1cd0143fe 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustcompanyinfo/DustCompanyinfoController.java @@ -99,7 +99,16 @@ public class DustCompanyinfoController { @PreAuthorize("@ss.hasPermission('system:dust-companyinfo:query')") public CommonResult> getDustCompanyinfoPage(@Valid DustCompanyinfoPageReqVO pageReqVO) { PageResult pageResult = dustCompanyinfoService.getDustCompanyinfoPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DustCompanyinfoRespVO.class)); + PageResult result = BeanUtils.toBean(pageResult, DustCompanyinfoRespVO.class); + List resultList = result.getList(); + for (DustCompanyinfoRespVO vo : resultList) { + DustDustinfoDO dustDustinfo = dustDustinfoService.getDustDustinfo(vo.getId()); + List list = Arrays.stream(dustDustinfo.getDustTechnology().split(",")).toList(); + DustDustinfoRespVO dustinfoRespVO = BeanUtils.toBean(dustDustinfo, DustDustinfoRespVO.class); + dustinfoRespVO.setDustTechnology(list); + vo.setDustDustinfo(dustinfoRespVO); + } + return success(result); } @GetMapping("/export-excel")