diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 8c3af136..346da6d4 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1581,6 +1581,10 @@ public class AppHotworkCfdController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = hotworkCfdService.jslist(page); //列出confinedspace列表 + // created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人 + for(PageData dto: varList){ + hotworkCfdService.addInfo(dto); + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -1771,6 +1775,10 @@ public class AppHotworkCfdController extends BaseController { PageData request = this.getPageData(); page.setPd(request); List varList = hotworkCfdService.safetyList(page); + // created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人 + for(PageData dto: varList){ + hotworkCfdService.addInfo(dto); + } response.put("varList", varList); response.put("page", page); response.put("result", "success");