Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontUniversitiesController.java

@@ -231,11 +231,12 @@ public class FrontUniversitiesController extends BaseController {
         }
         SysUser user = SecurityUtils.getLoginUser().getUser();
         cond.setEnrollLocation(user.getLocation());
+        List<BBusiWishUniversities> arr;
+        Integer planYear = voluntaryService.getPlanYear(user);
+
         if (null != pageNum && pageNum >= 0) {
             startPage();
         }
-        List<BBusiWishUniversities> arr;
-        Integer planYear = voluntaryService.getPlanYear(user);
         if(Constant.EXAM_TYPE_ZG.equals(user.getExamType().title())) {
             //职高对口
             arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getExamMajor(), user.getLocation(),cond.getTiers(),cond.getCityName())); // TODO MF