From bf5fc537fe8b9efefa98d2b16b43a7c7fce55606 Mon Sep 17 00:00:00 2001 From: Fai Luk Date: Thu, 3 Sep 2026 19:20:57 +0800 Subject: [PATCH] try to fix the onpack expiry date setting --- src/main/java/com/ffii/core/support/JdbcDao.java | 6 ++++-- .../modules/jobOrder/service/OnPackTemplateFileService.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/core/support/JdbcDao.java b/src/main/java/com/ffii/core/support/JdbcDao.java index c6854ff..cc227db 100644 --- a/src/main/java/com/ffii/core/support/JdbcDao.java +++ b/src/main/java/com/ffii/core/support/JdbcDao.java @@ -46,7 +46,8 @@ public class JdbcDao { */ public String queryForString(String sql, Map paramMap) { try { - return this.template.queryForObject(sql, paramMap, String.class); + String value = this.template.queryForObject(sql, paramMap, String.class); + return value != null ? value : StringUtils.EMPTY; } catch (EmptyResultDataAccessException e) { return StringUtils.EMPTY; } @@ -60,7 +61,8 @@ public class JdbcDao { */ public String queryForString(String sql, Object paramObj) { try { - return this.template.queryForObject(sql, new BeanPropertySqlParameterSource(paramObj), String.class); + String value = this.template.queryForObject(sql, new BeanPropertySqlParameterSource(paramObj), String.class); + return value != null ? value : StringUtils.EMPTY; } catch (EmptyResultDataAccessException e) { return StringUtils.EMPTY; } diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt index 2dc7790..a6df5b1 100644 --- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt +++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt @@ -347,7 +347,7 @@ open class OnPackTemplateFileService( LIMIT 1 """.trimIndent(), mapOf("machine" to machine, "code" to itemCode), - ).trim().takeIf { it.isNotEmpty() } + ).orEmpty().trim().takeIf { it.isNotEmpty() } } catch (_: DataAccessException) { null }