第二版,修改排序

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -687,6 +687,7 @@ public class BmsEventOrderService {
         queryWrapper.lambda().eq(CareSysUser::getStatus,ChambStatusEnum.FREE.getValue()).eq(CareSysUser::getOrgId,order.getOrgId()).eq(CareSysUser::getStationId,order.getStationId());
         List<CareSysUser> list = this.careSysUserService.list(queryWrapper);
         if(CollUtil.isNotEmpty(list)){
+            List<ChamberlainVO> tmp = new ArrayList<>();
             list.forEach(item->{
                 ChamberlainVO chamberlainVO = new ChamberlainVO();
                 BeanUtil.copyProperties(item,chamberlainVO);
@@ -694,11 +695,13 @@ public class BmsEventOrderService {
                 CareDevice careDevice = this.careDeviceService.getById(order.getDevId());
                 if(careDevice != null && chamberlainVO.getId().equals(careDevice.getChambId())) {
                     chamberlainVO.setIsMain(TrueFalseEnum.TRUE.getValue());
+                    freeChamberlainList.add(chamberlainVO);
                 } else {
                     chamberlainVO.setIsMain(TrueFalseEnum.FALSE.getValue());
+                    tmp.add(chamberlainVO);
                 }
-                freeChamberlainList.add(chamberlainVO);
             });
+            freeChamberlainList.addAll(tmp);
         }
 
         return freeChamberlainList;