作息bug处理

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -418,7 +418,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                 List<SysWorkTime> workTimeEditDtoList = new ArrayList<SysWorkTime>();
                 for (DateTime dateTime : dateTimeList) {
 
-                    Optional<SysWorkTimeSetDayofweek> sameDayOfWeek = dayofweekList.stream().filter(w -> ObjectUtil.equal(String.valueOf(w.getDayOfWeek()), String.valueOf(dateTime.dayOfWeek()-1))).findFirst();
+                    Optional<SysWorkTimeSetDayofweek> sameDayOfWeek = dayofweekList.stream().filter(w -> ObjectUtil.equal(String.valueOf(w.getDayOfWeek()), String.valueOf(dateTime.dayOfWeek()))).findFirst();
                     if (!sameDayOfWeek.isPresent()) {
                         return;
                     }
@@ -431,7 +431,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                     workTime.setIsEnable(isEnable ? 1L : 0);
                     workTime.setIsDuty(dayOfWeek.getIsDuty());
 
-                    if (ObjectUtil.equal(dayOfWeek.getIsWorkday(), 1L)) {
+                    if (ObjectUtil.notEqual(dayOfWeek.getIsWorkday(), 1L)) {
                         Optional<SysWorkTimeSetDayofweek> firstWorkDay = dayofweekList.stream().filter(f -> ObjectUtil.equal(f.getIsWorkday(), 1)).findFirst();
                         dayOfWeek = firstWorkDay.orElseGet(SysWorkTimeSetDayofweek::new);
                     }