|
@@ -120,7 +120,8 @@ public class BmsSysUserService{
|
|
|
public List<SysUserVO> queryKeeperListByStationId(Long orgId, Long stationId){
|
|
|
List<SysUserVO> datas = new ArrayList<>();
|
|
|
QueryWrapper<CareSysUser> userQueryWrapper = new QueryWrapper<>();
|
|
|
- userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId).eq(CareSysUser::getStationId,stationId)
|
|
|
+ userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId)
|
|
|
+ .eq(stationId !=null,CareSysUser::getStationId,stationId)
|
|
|
.eq(CareSysUser::getRole, UserRoleEnum.CHANMB.getValue())
|
|
|
.orderByAsc(CareSysUser::getName);
|
|
|
List<CareSysUser> users = this.careSysUserService.list(userQueryWrapper);
|