Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -123,6 +123,7 @@ public class DingMessageController {
                         log.info("审批详情："+JSONObject.toJSONString(result) );
                         AttendanceLeaveRecordEntity leaveRecordEntity = new AttendanceLeaveRecordEntity();
                         AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = new AttendanceVacationBalanceEntity();
+                        attendanceVacationBalanceEntity.initAttrValue();
                         leaveRecordEntity.initAttrValue();
                         leaveRecordEntity.setRemark(processInstanceId);   //将钉钉的事物id作为备注填入数据库
 
@@ -260,7 +261,7 @@ public class DingMessageController {
                                 }else if (result.getFormComponentValues().size() > 2) {  //上传的附件
                                     GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResultFormComponentValues picEntity = result.getFormComponentValues().get(2);
                                     if(picEntity.getName().equals("图片") && picEntity.getValue() != null){
-                                        leaveRecordEntity.setReason(picEntity.getValue());
+                                        leaveRecordEntity.setAttachmentPath(picEntity.getValue());
                                     }
                                 }