fllmoyu 5 rokov pred
rodič
commit
8dfd88e471

+ 1 - 0
common/src/main/java/com/jpsoft/smart/modules/business/service/impl/FillAttendanceServiceImpl.java

@@ -136,6 +136,7 @@ public class FillAttendanceServiceImpl implements FillAttendanceService {
             FillAttendance fillAttendance = new FillAttendance();
             fillAttendance.setId(UUID.randomUUID().toString());
             fillAttendance.setPersonId(personId);
+            fillAttendance.setContent(content);
             fillAttendance.setType(type);
             fillAttendance.setFillDay(workAttendanceDate);
             fillAttendance.setFillAttendanceTime(workAttendanceTime);

+ 6 - 1
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/WorkAttendanceApiController.java

@@ -621,7 +621,12 @@ public class WorkAttendanceApiController {
                 workAttendanceDTO.setTypeN("补卡");
             }
             workAttendanceDTO.setCompanyName(personInfo.getCompanyName());
-            workAttendanceDTO.setFillAttendanceFilesUrl(fillAttendanceFiles.getFileUrl() == null ? "" : fillAttendanceFiles.getFileUrl());
+            if (fillAttendanceFiles != null){
+                workAttendanceDTO.setFillAttendanceFilesUrl(fillAttendanceFiles.getFileUrl() == null ? "" : fillAttendanceFiles.getFileUrl());
+            }else {
+                workAttendanceDTO.setFillAttendanceFilesUrl("");
+            }
+
 
             msgResult.setData(workAttendanceDTO);