专题绑定关键词组bug修改

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -428,12 +428,13 @@ public class SubjectManageController {
     /**
      * 专题绑定关键词组列表-专题配置页
      *
-     * @param subjectId 专题id
+     * @param id 专题id
+     * @param bindingType 词组类型
      * @return
      */
     @GetMapping(value = "/bindKeyWordsList")
-    public Result<?> bindKeyWordsList(@RequestParam String subjectId) {
-        List<KeyWordsPage> bindKeyWordsList = subjectKeywordsMapService.bindKeyWordsList(subjectId);
+    public Result<?> bindKeyWordsList(@RequestParam(name = "id") String id,@RequestParam(name = "bindingType",required = false) String bindingType) {
+        List<KeyWordsPage> bindKeyWordsList = subjectKeywordsMapService.bindKeyWordsList(id,bindingType);
         return Result.OK(bindKeyWordsList);
     }
 

src/main/java/com/zzsn/event/es/EsService.java

@@ -1337,7 +1337,7 @@ public class EsService {
         subjectIdList.add(subjectId);
         List<String> infoSourceIdList = subjectInfoSourceMapService.subjectRealBindInfoSourceList(subjectIdList);
         //查询专题绑定的关键词组
-        List<KeyWordsPage> list = subjectKeywordsMapService.bindKeyWordsList(subjectId);
+        List<KeyWordsPage> list = subjectKeywordsMapService.bindKeyWordsList(subjectId, "1");
         for (KeyWordsPage keyWordsPage : list) {
             infoSourceIdList.add(keyWordsPage.getId());
         }

src/main/java/com/zzsn/event/mapper/ClbLabelInfoSourceMapMapper.java

@@ -2,6 +2,7 @@ package com.zzsn.event.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.event.entity.ClbLabelInfoSourceMap;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.zzsn.event.entity.ClbLabelInfoSourceMap;
  * @author obcy
  * @since 2025-01-03
  */
+@Mapper
 public interface ClbLabelInfoSourceMapMapper extends BaseMapper<ClbLabelInfoSourceMap> {
 
 }

src/main/java/com/zzsn/event/mapper/SubjectKeywordsMapMapper.java

@@ -27,7 +27,7 @@ public interface SubjectKeywordsMapMapper extends BaseMapper<SubjectKeywordsMap>
 
     void deleteBySubjectId (@Param("subjectId") String subjectId);
 
-    List<KeyWordsPage> bindKeyWordsList(@Param("subjectId") String subjectId);
+    List<KeyWordsPage> bindKeyWordsList(@Param("subjectId") String subjectId, @Param("bindingType")String bindingType);
 
     List<SearchWordVO> subjectBindWordInfo(@Param("subjectId") String subjectId);
 }

src/main/java/com/zzsn/event/mapper/xml/SubjectKeywordsMapMapper.xml

@@ -57,6 +57,9 @@
         LEFT JOIN keywords_type_map c ON b.id = c.keywords_id
         LEFT JOIN keywords_type d ON d.id = c.type_id
         where a.subject_id = #{subjectId}
+            <if test="bindingType != null and bindingType != ''">
+                and a.binding_type = #{bindingType}
+            </if>
         group by b.id
     </select>
 

src/main/java/com/zzsn/event/service/ISubjectKeywordsMapService.java

@@ -45,10 +45,11 @@ public interface ISubjectKeywordsMapService extends IService<SubjectKeywordsMap>
      * 专题绑定关键词组集合-专题配置页
      *
      * @param subjectId   专题id
+     * @param bindingType
      * @author lkg
      * @date 2024/12/23
      */
-    List<KeyWordsPage> bindKeyWordsList(String subjectId);
+    List<KeyWordsPage> bindKeyWordsList(String subjectId, String bindingType);
 
     List<SearchWordVO> subjectBindWordInfo(String subjectId);
 }

src/main/java/com/zzsn/event/service/impl/SubjectKeywordsMapServiceImpl.java

@@ -43,8 +43,8 @@ public class SubjectKeywordsMapServiceImpl extends ServiceImpl<SubjectKeywordsMa
     }
 
     @Override
-    public List<KeyWordsPage> bindKeyWordsList(String subjectId) {
-        return baseMapper.bindKeyWordsList(subjectId);
+    public List<KeyWordsPage> bindKeyWordsList(String subjectId, String bindingType) {
+        return baseMapper.bindKeyWordsList(subjectId,bindingType);
     }
 
     @Override