梯队

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

@@ -224,14 +224,11 @@ public class FrontSyMajorRelationController extends BaseController {
         List<SyMajor> majorList = syMajorService.selectSyMajorList(query);
         List<SyVocational> toList = new ArrayList<>();
 
-        LoginUser loginUser = SecurityUtils.getLoginUser();
         List<String>  majorListByPlan = new ArrayList<>();
         //湖南：计划中有的专业加入
-        if (null != loginUser){
-            String location = loginUser.getUser().getLocation();
-            if ("湖南".equals(location)){
-                majorListByPlan = syMajorService.selectMajorsByPlan(location).stream().map(major->major.getName()).collect(Collectors.toList());
-            }
+        String location = VistorContextHolder.getLocation();
+        if ("湖南".equals(location)){
+            majorListByPlan = syMajorService.selectMajorsByPlan(location).stream().map(major->major.getName()).collect(Collectors.toList());
         }
         Boolean isFilter = false;
         for (SyMajor major : majorList) {

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

@@ -42,6 +42,7 @@ public class FrontSyVocationalController extends BaseController {
 
     @GetMapping("getVocationalPostDetailByPostName")
     @ApiOperation("05 根据就业岗位名称获取岗位详情")
+    @Anonymous
     public AjaxResult getVocationalPostDetailByPostName(@RequestParam(required = true) String postName) {
         SyVocationalPostDetail vocationalPostDetail = vocationalPostDetailService.selectSyVocationalPostDetailByName(postName);
         return AjaxResult.success(vocationalPostDetail);

ie-system/src/main/java/com/ruoyi/syzy/domain/BBusiWishUniversities.java

@@ -49,6 +49,7 @@ public class BBusiWishUniversities extends BaseEntity {
     private String level;
 
     private Integer tier;
+    private String tierName;
 
     /** 一流大学建设高校(1:不是,2:是) */
     @Excel(name = "一流大学建设高校(1:不是,2:是)")
@@ -126,6 +127,14 @@ public class BBusiWishUniversities extends BaseEntity {
     private String enrollLocation;
     private Boolean collected;
 
+    public String getTierName() {
+        return tierName;
+    }
+
+    public void setTierName(String tierName) {
+        this.tierName = tierName;
+    }
+
     public Integer getArea() {
         return area;
     }

ie-system/src/main/java/com/ruoyi/syzy/service/impl/BBusiWishUniversitiesServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.syzy.dto.UniversityDetailDTO;
 import com.ruoyi.syzy.mapper.*;
 import com.ruoyi.syzy.service.IBBusiWishUniversitiesEnrollBrochureService;
 import com.ruoyi.syzy.service.IBBusiWishUniversitiesService;
+import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.util.ConstantUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,8 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
     private BBusiWishUniversitiesSubjectMapper universitiesSubjectMapper;
     @Autowired
     private IBBusiWishUniversitiesEnrollBrochureService universitiesEnrollBrochureService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
 
 
@@ -55,7 +58,17 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
 
     @Override
     public BBusiWishUniversities selectBBusiWishUniversitiesByCode(String code) {
-        return bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesByCode(code);
+        BBusiWishUniversities result  = bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesByCode(code);
+        if(result != null){
+            // 如果tier有值，则从字典dict_type=tier_type中取到值并将label赋值给tierName
+            if(result.getTier() != null){
+                String tierName = dictTypeService.getDictDataByType("tier_type", String.valueOf(result.getTier()));
+                if(tierName != null && !tierName.isEmpty()){
+                    result.setTierName(tierName);
+                }
+            }
+        }
+        return result;
     }
 
     /**

ie-system/src/main/resources/mapper/syzy/BBusiWishUniversitiesMapper.xml

@@ -61,13 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <result property="area" column="area" />
     <result property="enrollLocation" column="enrollLocation" />
     <result property="collect" column="collect" />
+    <result property="tier" column="tier" />
   </resultMap>
 
   <sql id="selectBBusiWishUniversitiesVo">
     select id, code, name, logo, location, managerType, type, level, tel, url, favorities, createTime, status,
         numberOfBSH,numberOfStu,comScore,rankingOfEdu,ranking,createdYear,shuoShiZBWZ,vrUrl,motto,zhaoBanWZ,shortName,cityName,
         enName,introduction,star,vrShortUrl,celebrateDay,natureType,majorRule,pointsOfBo,pointsOfShuo,bxLevel,features,
-        entranceType,shuoShiZBDH,bxType,zhaoBanDH,address,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect
+        entranceType,shuoShiZBDH,bxType,zhaoBanDH,address,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect,tier
         from b_busi_wish_universities
   </sql>