Commit d0f85043 by 陶光胜

门店批量导入修改

parent adcca63e
......@@ -568,12 +568,12 @@ public class StoreApiServiceImpl implements StoreApiService {
@Override
public ServiceResponse<Page<StoreDTO>> listStore(StoreSearchDTO storeSearchDTO, Integer pageNum, Integer pageSize, String returnFileds) {
if (storeSearchDTO.getEnterpriseId() == null) {
/*if (storeSearchDTO.getEnterpriseId() == null) {
return EnterpriseServiceResponse.failure(ErrorCode.ENTERPRISE_EMPTY);
}
}*/
JSONObject enterpriseJson = this.buildSearchJSON(storeSearchDTO);
if(enterpriseJson == null){ //null表示没有权限
return ServiceResponse.success();
return ServiceResponse.success(new Page<>(pageNum, pageSize));
}
JSONObject sortJson = null;
if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLatitude())){
......@@ -603,7 +603,7 @@ public class StoreApiServiceImpl implements StoreApiService {
page.setResult(result);
return ServiceResponse.success(page);
}
return ServiceResponse.success();
return ServiceResponse.success(new Page<>(pageNum, pageSize));
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment