|
|
@@ -46,9 +46,9 @@ public class PincheCarSharingAppServiceImpl implements IPincheCarSharingAppServi
|
|
|
@Override
|
|
|
public Page<PincheCarSharing> list(Long companyId, String carpoolingType, String route, String phone, String startPlace, String endPlace, String departureLatitude, String latitudeArrival, Date departureTime, String numberPeople, String explain, Double unitPrice, Double price, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
|
|
|
Wrapper<PincheCarSharing> wrapper = new EntityWrapper<PincheCarSharing>();
|
|
|
- if (!StringUtils.isEmpty(companyId)) {
|
|
|
- wrapper.eq("company_id", companyId);
|
|
|
- }
|
|
|
+// if (!StringUtils.isEmpty(companyId)) {
|
|
|
+// wrapper.eq("company_id", companyId);
|
|
|
+// }
|
|
|
if (!StringUtils.isEmpty(carpoolingType)) {
|
|
|
wrapper.eq("carpooling_type", carpoolingType);
|
|
|
}
|
|
|
@@ -113,7 +113,9 @@ public class PincheCarSharingAppServiceImpl implements IPincheCarSharingAppServi
|
|
|
wrapper.eq("admin_id", adminId);
|
|
|
}
|
|
|
wrapper.eq("delete_flag", 0);
|
|
|
- wrapper.notIn("number_people","0");
|
|
|
+ if (!StringUtils.isEmpty(companyId)) {
|
|
|
+ wrapper.notIn("number_people","0");
|
|
|
+ }
|
|
|
wrapper.orderBy("departure_time", false);
|
|
|
List<PincheCarSharing> list = pincheCarSharingMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
|
|
|
if (!CollectionUtils.isEmpty(list)) {
|
