刪除員工，排班重新開始

house365-hgs-ws/src/main/java/com/house365/ws/service/impl/StaffDuty.java

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * 配置好表数据,定时轮询值日人员.onduty:是否值日,1:当前之日,0:不值日
@@ -121,20 +122,28 @@ public class StaffDuty implements IStaffDuty {
             searchParams.put("cityCode", department.getDescripition());
             List<UserEntity> dutyUserByCity = usermapper.getDutyUserByCity(searchParams);
             if (CollectionUtils.isNotEmpty(dutyUserByCity)) {
-                int size = dutyUserByCity.size();
-                for (int i = 0; i < size; i++) {
-                    UserEntity userEntity = dutyUserByCity.get(i);
-                    if (userEntity.getEnabled()) {
-                        UserEntity entity = null;
-                        if (i < (size - 1)) {
-                            entity = dutyUserByCity.get(i + 1);
-                        } else {
-                            entity = dutyUserByCity.get(0);
+                //獲取當前值班數量
+                List<UserEntity> collect = dutyUserByCity.stream().filter(ii -> ii.getEnabled()).collect(Collectors.toList());
+                if(collect == null || collect.size() == 0) {
+                    UserEntity entity = dutyUserByCity.get(0);
+                    usermapper.updateDutyOnduty(entity.getId(), date, 1);
+                } else {
+                    int size = dutyUserByCity.size();
+                    for (int i = 0; i < size; i++) {
+                        UserEntity userEntity = dutyUserByCity.get(i);
+                        if (userEntity.getEnabled()) {
+                            UserEntity entity = null;
+                            if (i < (size - 1)) {
+                                entity = dutyUserByCity.get(i + 1);
+                            } else {
+                                entity = dutyUserByCity.get(0);
+                            }
+                            usermapper.updateDutyOnduty(userEntity.getId(), date, 0);
+                            usermapper.updateDutyOnduty(entity.getId(), date, 1);
                         }
-                        usermapper.updateDutyOnduty(userEntity.getId(), date, 0);
-                        usermapper.updateDutyOnduty(entity.getId(), date, 1);
                     }
                 }
+
             }
 
         }