增加开放的营地信息列表

5274a13d · youjj · 83075f63 · 5274a13d
Commit 5274a13d authored May 14, 2019 by youjj
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CampsiteBiz.java ...va/com/xinxincaravan/caravan/vehicle/biz/CampsiteBiz.java +1 -1

No files found.
--- a/vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/CampsiteBiz.java
+++ b/vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/CampsiteBiz.java
@@ -98,7 +98,7 @@ public class CampsiteBiz extends BaseBiz<CampsiteMapper, Campsite> {
        if(addrTown!=null) {
            criteria.andCondition(" addr_town = '" + addrTown + "'");
        }
-        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
+        if(userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
            if(StringUtils.isNotBlank(userDTO.getDataZone())) {
                criteria.andIn(COMPANY_ZONE_ID, userDTO.dataZone2List());
            }