diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index 41a49fa60..b6c4e1171 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -173,7 +173,7 @@ public class SysWorkplaceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/sysWorkplace/label/print") - public BaseResponse printLabel(@RequestBody SysWorkplace sysWorkplace, HttpServletRequest request, HttpServletResponse response) throws Exception { + public BaseResponse printLabel(@RequestBody SysWorkplaceResponse sysWorkplace, HttpServletRequest request, HttpServletResponse response) throws Exception { SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplace.getLabelId() + ""); if (null == sysPdfTemplateRelevanceLabelEntity) { @@ -189,7 +189,7 @@ public class SysWorkplaceController extends BaseController { Map supData = new HashMap<>(); supData.put("workplaceId", sysWorkplace.getWorkplaceId() + ""); supData.put("workplaceName", sysWorkplace.getWorkplaceName() == null ? ' ' : sysWorkplace.getWorkplaceName()); - supData.put("invName", sysWorkplace.getInvName() == null ? ' ' : sysWorkplace.getInvName()); + supData.put("deptCodeName", sysWorkplace.getDeptCodeName() == null ? ' ' : sysWorkplace.getDeptCodeName()); supData.put("remake", sysWorkplace.getRemake() == null ? ' ' : sysWorkplace.getRemake()); supData.put("qrCode", "{\"DMHotskey\":{\"workPlace\":" + sysWorkplace.getWorkplaceId() + "}}"); data.put("data", supData);