From 0eefa34be59155a7f42eccb95106679b0ffcac75 Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Thu, 27 Mar 2025 16:01:57 +0800 Subject: [PATCH] commit --- .../sickHelp/controller/SickHelpMedicalInsController.java | 4 ++-- .../resources/views/platform/sickHelp/medicalIns/index.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java index 595d349..01041d1 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java @@ -278,7 +278,7 @@ public class SickHelpMedicalInsController { int fullCount = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1)); if (fullCount == 0) { - return Result.success("医保数据未导入!"); + return Result.error("医保数据未导入!"); } return Result.success(); } @@ -293,7 +293,7 @@ public class SickHelpMedicalInsController { } int fullCount = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1)); if (fullCount == 0) { - return Result.success("二次报销数据未导入!"); + return Result.error("二次报销数据未导入!"); } return Result.success(); } diff --git a/src/main/resources/views/platform/sickHelp/medicalIns/index.html b/src/main/resources/views/platform/sickHelp/medicalIns/index.html index caaa646..fd8510c 100644 --- a/src/main/resources/views/platform/sickHelp/medicalIns/index.html +++ b/src/main/resources/views/platform/sickHelp/medicalIns/index.html @@ -306,9 +306,9 @@ layout("/layouts/platform.html"){ if (!row.loginName || row.loginName === '' || row.loginName === undefined) { return 'table-error-row' } - if (!row.ecbx || row.ecbx === '' || row.ecbx === undefined) { - return 'table-error-row' - } + // if (row.loginName && ( !row.ecbx || row.ecbx === '' || row.ecbx === undefined)) { + // return 'table-error-row' + // } return ''; }