浏览代码

考勤记录查看完善。

zq 1 年之前
父节点
当前提交
fdad6c0825

+ 8 - 9
web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/WorkAttendanceApiController.java

@@ -171,21 +171,20 @@ public class WorkAttendanceApiController {
                             workDTO.setResult("4");
                         }
                     } else if (workDTO.getResult().equals("1")) {
-
                         if (StringUtils.isNotBlank(workDTO.getSupplementWorkPersonId())){
                             SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(workDTO.getSupplementWorkPersonId());
-                            SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
-
-                            workDTO.setSupplementWorkId(supplementWork.getId());
-                            if ("1".equals(supplementWork.getStatus())){
-                                workDTO.setStatus("1");
-                                workDTO.setStatusN("审核通过");
-                            }
 
+                            if (supplementWorkPerson!=null) {
+                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
 
+                                workDTO.setSupplementWorkId(supplementWork.getId());
+                                if ("1".equals(supplementWork.getStatus())) {
+                                    workDTO.setStatus("1");
+                                    workDTO.setStatusN("审核通过");
+                                }
+                            }
                          //   workDTO.setFillAttendanceId(fillAttendance.getId());
                         }
-
                     }
                 }