From 570bf2ec145967d798168a0ff12b2edf3034189f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 27 Aug 2019 09:17:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../core/apiservice/serviceimpl/busi/SysLabelTemplateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java index 0dc27ea..501fc25 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -160,7 +160,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { if(paramList != null && paramList.size() > 0){ for (SysLabelTemplateParam param : paramList) { for (SysLabelTemplate temp : list) { - if(temp.getId().equals(param.getId())){ + if(temp.getId().equals(param.getTemplateId())){ List params = temp.getLabelTemplateParamList(); if(params == null){ params = new ArrayList<>(); From ba470d5ea2d436856b7c4c12f758822e0ee68b39 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 27 Aug 2019 12:08:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96core=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=20=E8=BF=94=E5=9B=9E=E5=80=BC=E6=B7=BB=E5=8A=A0=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E6=B3=9B=E5=9E=8B=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/core/apiservice/controller/base/WhiteController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 1793f1f..8b39770 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -381,7 +381,7 @@ public class WhiteController extends CoreBaseController { */ @PostMapping(value = "/sys-label-template/list") @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板") - public ResultBean findSysConfigAll(@RequestBody SysLabelTemplate template){ + public ResultBean findSysConfigAll(@RequestBody SysLabelTemplate template){ try { List sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);; return ResultBean.success("操作成功")