From a42db56264fdb8437c7688b8b0ccb45befb60a36 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 20 Jul 2024 14:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=20=E4=B8=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E7=89=88=E6=97=B6=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/daoimpl/MesModuleExcelDaoImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesModuleExcelDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesModuleExcelDaoImpl.java index bfc1c0b..f191991 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesModuleExcelDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesModuleExcelDaoImpl.java @@ -69,7 +69,12 @@ public class MesModuleExcelDaoImpl implements IMesModuleExcelDao { hql.append(" and mem.isValid = :isValid "); hql.append(" and mem.isDeleted = :isDeleted "); if (!StringUtils.isEmpty(mesModuleExcel.getModuleCode())) { - hql.append(" and mem.moduleCode like :moduleCode "); + //主数据单独下载模版时不能模糊查询 + if (!StringUtils.isEmpty(mesModuleExcel.getQueryIsAllowLike()) && mesModuleExcel.getQueryIsAllowLike().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0) { + hql.append(" and mem.moduleCode like :moduleCode "); + } else { + hql.append(" and mem.moduleCode = :moduleCode "); + } } if (!StringUtils.isEmpty(mesModuleExcel.getModuleName())) { hql.append(" and mem.moduleName like :moduleName ");