合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/task/CardTask.java

@@ -201,8 +201,6 @@ public class CardTask {
 
                     String format1 = sdf2.format(parse);
                     Date date1 = sdf4.parse(format1);
-                    System.out.println(date);
-                    System.out.println(date1);
 //                    List<ApprovalInformation> all = approvalInformationDao.findAll();
 //                    System.out.println("startTime"+all.get(0).getLeaveStartTime()+"\n"+"endTime"+all.get(0).getLeaveEndTime());
                     Day day = dayDao.findByDate(parse);
@@ -385,10 +383,12 @@ public class CardTask {
                 if(attendanceDetails.getWorkOverHours()>=0){
                     UserOverWork userOverWork = userOverWorkDao.findByUserId(user.getId());
                     try {
+                        if(userOverWork!=null){
                             Long overWorkHour = userOverWork.getOverWorkHour();
                             Long timeLeft = overWorkHour + attendanceDetails.getWorkOverHours();
                             userOverWork.setOverWorkHour(timeLeft);
                             userOverWorkDao.save(userOverWork);
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -615,7 +615,6 @@ public class CardTask {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         String userId = "5e86ac92986f2c9064e29b32";
         Double fullScore = fullScore(sdf,month);
-        System.out.println(fullScore);
         Double minusScore = getScore(sdf,userId,month);
         Double monthScore = fullScore - minusScore;
         return monthScore;