zhengqiang преди 4 години
родител
ревизия
34479bde08
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/WorkOverServiceImpl.java

+ 3 - 1
common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/WorkOverServiceImpl.java

@@ -528,7 +528,9 @@ public class WorkOverServiceImpl implements WorkOverService {
 //							workOverPerson.setBeginTime(recordTime);
 //						}
 						if (workOverPerson.getFinishTime() == null) {
-							workOverPerson.setFinishTime(recordTime);
+							if(recordTime.after(workOverPerson.getBeginTime())) {
+								workOverPerson.setFinishTime(recordTime);
+							}
 						} else if (recordTime.after(workOverPerson.getFinishTime())) {
 							workOverPerson.setFinishTime(recordTime);
 						}