diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java index 0f91b1ad0d529b53bfe997edb6a4b170ee0778a3..693f4f5bab0089cb35c365790965985ea028b769 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java @@ -133,15 +133,15 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo { public void initAttrValue(){ this.leavePersonId = 0L; this.leavePerson = ""; - this.deptId = 0L; + this.deptId = null; this.deptName = ""; this.phoneNumber = ""; - this.leaveType = 0; + this.leaveType = null; this.startTime = new Date(); this.endTime = new Date(); this.duration = 0; this.reason = ""; - this.approverId = 0L; + this.approverId = null; this.approver = ""; this.attachment = ""; this.attachmentPath = ""; diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java index 4454cdf8ca379529998b736da3842b91a18f4bbe..96647ede65d175c3e0a713ed74edadf21f4e49de 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java @@ -65,10 +65,10 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont UserPdu userPdu = new UserPdu(); userPdu.setSize(-1); List <UserPdu> userPduList = iUserFeign.list(userPdu).getData().getData(); - Map<Long, String> ans = new HashMap<>(); + Map<String, String> ans = new HashMap<>(); for(UserPdu str: userPduList) { if(str != null) { //澧炲姞闈炵┖鍒ゆ柇 - ans.put(str.getId(), str.getRealName()); + ans.put(str.getId().toString(), str.getRealName()); } }