Merge remote-tracking branch 'origin/master'

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

@@ -292,8 +292,10 @@ public class DingMessageController {
 
                                     if(result.getResult().compareToIgnoreCase("AGREE") == 0){
                                         leaveRecordEntity.setAuditResult(AppealResultEnum.通过.getValue());
+                                        //10/19增加撤销审批状态
                                         if(result.getTasks().size() > 1){
-                                            if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0){
+                                            if((result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") == 0) ||
+                                                    result.getBizAction().compareToIgnoreCase("REVOKE") == 0){
                                                 leaveRecordEntity.setAuditResult(4);  //撤销审批完成
                                                 leaveRecordEntity.setAuditResult(AppealResultEnum.撤销审批通过.getValue());
                                             }