From 10d1c6ff2df880d8e182685ad17aa9475517f482 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期二, 08 十月 2024 11:02:19 +0800
Subject: [PATCH] 考勤看板

---
 src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java       |    2 +-
 src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java b/src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java
index a3c1a64..89c4d26 100644
--- a/src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java
+++ b/src/main/java/com/product/administration/controller/WorkAttendanceKanbanController.java
@@ -107,7 +107,7 @@
         } catch (Exception e) {
             e.printStackTrace();
             SpringMVCContextHolder.getSystemLogger().error(e);
-            return this.error(SystemCode.SYSTEM_GET_ADDRESS_LIST_FAIL.getValue(), SystemCode.SYSTEM_GET_ADDRESS_LIST_FAIL.getText());
+            return this.error(SystemCode.WORK_ATTENDANCE_REPORT_FAIL.getValue(), SystemCode.WORK_ATTENDANCE_REPORT_FAIL.getText());
         }
 	}
 	
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 5127f73..0a7fe28 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -210,7 +210,7 @@
 			if (!StringUtils.isEmpty(fs.getString("bk"))){
 				bk= Arrays.asList(fs.getString("bk").split(","));
 			}
-			if (fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")&&!StringUtils.isEmpty(fs.getString("bk"))){
+			if (!StringUtils.isEmpty(fs.getString("reidis"))&&fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")&&!StringUtils.isEmpty(fs.getString("bk"))){
 				if (!bk.contains("1")){
 					fs.setValue("result_one", "涓婂崍涓婄彮鏈墦鍗�");
 				}

--
Gitblit v1.9.2