From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
old mode 100644
new mode 100755
index b7e1718..9c5fa0b
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
@@ -138,8 +138,8 @@
             staffObj.put("extClassesId", attendanceClassesDto.getClassesId());
             staffObj.put("extStaffId", orgStaffRelDto1.getStaffId());
             staffObj.put("staffName", orgStaffRelDto1.getStaffName());
-            staffObj.put("departmentId", orgStaffRelDto1.getDepartmentId());
-            staffObj.put("departmentName", orgStaffRelDto1.getDepartmentName());
+            staffObj.put("departmentId", attendanceClassesDto.getClassesObjId());
+            staffObj.put("departmentName", attendanceClassesDto.getClassesObjName());
             staffObjs.add(staffObj);
         }
         return staffObjs;

--
Gitblit v1.8.0