fix: lable

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -273,7 +273,7 @@ public class BLessonServiceImpl implements BLessonService {
         }
         List<BLesson> result = bLessonRepository.queryPersonMore(curUser, departs);
         log.info("-----------addNew---------大家都在学查询课程或培训的总个数----------"+result.size()+"--------------------");
-        return addNew(result);
+        return addNew(addPushLable(result,curUser));
     }
 
     @Override
@@ -320,7 +320,7 @@ public class BLessonServiceImpl implements BLessonService {
         }
         List<BLesson> result = bLessonRepository.queryRecommend(curUser, departs);
         log.info("-----------addNew---------企业推荐查询课程或培训的总个数----------"+result.size()+"--------------------");
-        return addNew(result);
+        return addNew(addPushLable(result,curUser));
     }
 
     @Override
@@ -342,7 +342,7 @@ public class BLessonServiceImpl implements BLessonService {
 
         List<BLesson> result = bLessonRepository.queryConcern(curUser, departs);
         log.info("-----------addNew---------最受关注查询课程或培训的总个数----------"+result.size()+"--------------------");
-        return addNew(result);
+        return addNew(addPushLable(result,curUser));
     }
 
     @Override
@@ -364,7 +364,7 @@ public class BLessonServiceImpl implements BLessonService {
 
         List<BLesson> result = bLessonRepository.queryInterested(curUser, departs);
         log.info("-----------addNew---------可能感兴趣查询课程或培训的总个数----------"+result.size()+"--------------------");
-        return addNew(result);
+        return addNew(addPushLable(result,curUser));
     }
 
 
@@ -1220,7 +1220,7 @@ public class BLessonServiceImpl implements BLessonService {
                 throw new ServiceException(ResultServiceEnums.INVALID_PARAMETER_VALUE);
         }
 
-        return addNew(ListAllLesson);
+        return addNew(addPushLable(ListAllLesson,curUser));
     }
 
     @Override
@@ -2106,7 +2106,12 @@ public class BLessonServiceImpl implements BLessonService {
             List<String> list = new ArrayList<>();
             String pushLable = bLessonRepository.getPushLable(lesson.getBusinessId());
             // 获取 推荐课程的 企业自定义 标签
-            List<QueryLabelResDTO> lableList = bLessonRepository.queryLabelByLessonId2(lesson.getBusinessId(),curUser.getCorpId());
+            List<QueryLabelResDTO> lableList = new ArrayList<>();
+            if(!"###".equals(lesson.getCorpId())){
+                lableList = bLessonRepository.queryLabelByLessonId(lesson.getBusinessId());
+            }else {
+                lableList = bLessonRepository.queryLabelByLessonId2(lesson.getBusinessId(),curUser.getCorpId());
+            }
             if(StringUtils.isNotEmpty(pushLable))
                 list.addAll(asList(pushLable.split(",")));
             if( list != null && list.size() > 0){

src/main/resources/mapper/business/blesson/mapper/BLessonMapper.xml

@@ -47,10 +47,10 @@
           <result column="corp_id" jdbcType="VARCHAR" property="corpId"/>
 
           <!---->
-          <collection property="labelList" ofType="org.rcisoft.business.blabel.dto.QueryLabelResDTO"
-                      javaType="java.util.ArrayList" select="org.rcisoft.business.blesson.dao.BLessonRepository.queryLabelByLessonId"
-                      column="business_id">
-          </collection>
+<!--          <collection property="labelList" ofType="org.rcisoft.business.blabel.dto.QueryLabelResDTO"-->
+<!--                      javaType="java.util.ArrayList" select="org.rcisoft.business.blesson.dao.BLessonRepository.queryLabelByLessonId"-->
+<!--                      column="business_id">-->
+<!--          </collection>-->
      </resultMap>