Merge branch 'lal' into 'develop'

提交 See merge request 8timerv2/8timerapiv200!418

Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!418
9335fd06 · leialin · fa568dc1 · bdec7879 · 9335fd06
Commit 9335fd06 authored Aug 12, 2020 by leialin
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -3044,7 +3044,7 @@ public class ClockInController {
 						 }else {
 							 if(iscrdk) {
 								 AttSchedule attc = attsch.get(0);
-								 if(attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) {
+								 if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) {
 									 attc.getDajl().setId(null);
 									 attc.getDajl().setSort(null);
 									 attc.getDajl().setStatus(null);