Merge remote-tracking branch 'origin/master'

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/BranchCompanyBiz.java

@@ -97,7 +97,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         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());
             }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/BranchCompanyController.java

@@ -41,7 +41,7 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
-    @IgnoreUserToken
+
     @RequestMapping(value ="/page",method = RequestMethod.GET)
     public RestResponse<PageDataVo<BranchCompany>> page(@RequestParam Integer page, @RequestParam Integer limit,
                                                           @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
@@ -52,6 +52,14 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, userDTO));
     }
 
+    @IgnoreUserToken
+    @RequestMapping(value = "/allPage", method = RequestMethod.GET)
+    public RestResponse<PageDataVo<BranchCompany>> allPage(@RequestParam Integer page, @RequestParam Integer limit,
+                                                           @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
+                                                           @RequestParam(required = false) Integer addrTown) {
+        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, null));
+    }
+
     @RequestMapping(value ="",method = RequestMethod.GET)
     public RestResponse<List<BranchCompany>> getAll() {
         return RestResponse.data(baseBiz.getAll());