|
@@ -48,7 +48,7 @@ public class StationService {
|
|
QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CareStation> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareStation::getName,name)
|
|
queryWrapper.lambda().like(StrUtil.isNotEmpty(name),CareStation::getName,name)
|
|
.eq(orgId != null,CareStation::getOrgId,orgId)
|
|
.eq(orgId != null,CareStation::getOrgId,orgId)
|
|
- .eq(CareStation::getOrgId,loginUser.getOrgId())
|
|
|
|
|
|
+ .eq(loginUser.getOrgId() != null,CareStation::getOrgId,loginUser.getOrgId())
|
|
.orderByAsc(CareStation::getName);
|
|
.orderByAsc(CareStation::getName);
|
|
|
|
|
|
IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
|
|
IPage<CareStation> pageRes = this.careStationService.page(page, queryWrapper);
|