From 3aebaf3cb36ec42461301e0abf0bd121baef9da5 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 29 Jun 2024 19:12:24 +0800 Subject: [PATCH] =?UTF-8?q?204=E6=9C=BA=E5=8F=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/MachineTemplateServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 779a551e2..cf69c3778 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -256,13 +256,16 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } List machineTemplateDOS = machineTemplateMapper.selectList(MachineTemplateDO::getMachineType, templateDO.getMachineType(), MachineTemplateDO::getIsDefault, Boolean.TRUE); - if(CollectionUtil.isEmpty(machineTemplateDOS) || machineTemplateDOS.size()>1) { - throw exception(DEFAULT_TEMPLATE_COUNT); +// if(CollectionUtil.isEmpty(machineTemplateDOS) || machineTemplateDOS.size()>1) { +// throw exception(DEFAULT_TEMPLATE_COUNT); +// } + + if(!machineTemplateDOS.isEmpty()){ + MachineTemplateDO machineTemplateDO = new MachineTemplateDO(); + machineTemplateDO.setId(machineTemplateDOS.get(0).getId()); + machineTemplateDO.setIsDefault(Boolean.FALSE); + machineTemplateMapper.updateById(machineTemplateDO); } - MachineTemplateDO machineTemplateDO = new MachineTemplateDO(); - machineTemplateDO.setId(machineTemplateDOS.get(0).getId()); - machineTemplateDO.setIsDefault(Boolean.FALSE); - machineTemplateMapper.updateById(machineTemplateDO); templateDO.setIsDefault(Boolean.TRUE); machineTemplateMapper.updateById(templateDO);