|
@@ -685,7 +685,7 @@ public class BmsEventOrderService {
|
|
CareEventOrder order = this.careEventOrderService.getById(orderId);
|
|
CareEventOrder order = this.careEventOrderService.getById(orderId);
|
|
|
|
|
|
QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
|
|
- queryWrapper.lambda().eq(CareSysUser::getStatus,ChambStatusEnum.FREE.getValue()).eq(CareSysUser::getOrgId,order.getOrgId()).eq(CareSysUser::getStationId,order.getStationId());
|
|
|
|
|
|
+ queryWrapper.lambda().eq(CareSysUser::getStatus,ChambStatusEnum.FREE.getValue()).eq(CareSysUser::getRole,"chanmb").eq(CareSysUser::getOrgId,order.getOrgId()).eq(CareSysUser::getStationId,order.getStationId());
|
|
List<CareSysUser> list = this.careSysUserService.list(queryWrapper);
|
|
List<CareSysUser> list = this.careSysUserService.list(queryWrapper);
|
|
if(CollUtil.isNotEmpty(list)){
|
|
if(CollUtil.isNotEmpty(list)){
|
|
List<ChamberlainVO> tmp = new ArrayList<>();
|
|
List<ChamberlainVO> tmp = new ArrayList<>();
|