|
@@ -364,17 +364,20 @@ public class BmsSysUserService{
|
|
|
* @return
|
|
|
*/
|
|
|
public IPage<SysUserVO> listStationAccount(String stationName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
|
|
|
- Long stationId = null;
|
|
|
|
|
|
QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
|
|
|
queryWrapper0.lambda().like(StrUtil.isNotEmpty(stationName),CareStation::getName,stationName);
|
|
|
- CareStation careStation = careStationService.getOne(queryWrapper0);
|
|
|
- if (careStation != null){
|
|
|
- stationId = careStation.getId();
|
|
|
+ List<CareStation> careStations = careStationService.list(queryWrapper0);
|
|
|
+ List<Long> stationIds = new ArrayList<>();
|
|
|
+ if (CollUtil.isNotEmpty(careStations)){
|
|
|
+ careStations.forEach(item -> {
|
|
|
+ stationIds.add(item.getId());
|
|
|
+ });
|
|
|
}
|
|
|
+
|
|
|
IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
|
|
|
QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda() .eq(stationId != null,CareSysUser::getStationId,stationId)
|
|
|
+ queryWrapper.lambda() .in(CollUtil.isNotEmpty(stationIds),CareSysUser::getStationId,stationIds)
|
|
|
.eq(CareSysUser::getOrgId,loginUser.getOrgId())
|
|
|
.eq(CareSysUser::getRole,UserRoleEnum.STATION.getValue())
|
|
|
.orderByAsc(CareSysUser::getName);
|