合并分支 'dev_lkg_0604' 到 'event_fusion'

研究中心-列表默认不展示复合专题

查看合并请求 !2

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

@@ -33,14 +33,14 @@ public interface SubjectMapper extends BaseMapper<Subject> {
     Page<SubjectPage> pageList(@Param("subjectCondition") SubjectCondition subjectCondition, Page<SubjectPage> page);
 
     /**
-     *专题分页列表-新
+     * 专题分页列表-新
      *
      * @param subjectCondition 查询条件
-     * @param page 分页参数
+     * @param page             分页参数
      * @author lkg
      * @date 2025/3/25
      */
-    Page<SubjectPageVO> pageList_new(Page<SubjectPageVO> page,@Param("subjectCondition") SubjectCondition subjectCondition,@Param("userId") String userId);
+    Page<SubjectPageVO> pageList_new(Page<SubjectPageVO> page, @Param("subjectCondition") SubjectCondition subjectCondition, @Param("userId") String userId);
 
     /**
      * 专题详情(包含专题分类、专题项目)
@@ -50,6 +50,7 @@ public interface SubjectMapper extends BaseMapper<Subject> {
      * @date 2025/3/25
      */
     SubjectPage getInfo(@Param("subjectId") String subjectId);
+
     /**
      * 专题分页列表（个人）-研究中心
      *
@@ -68,7 +69,7 @@ public interface SubjectMapper extends BaseMapper<Subject> {
      * @author lkg
      * @date 2025/1/14
      */
-    Page<SubjectPage> researchCenterFacePageList(@Param("subjectCondition") SubjectCondition subjectCondition, Page<SubjectPage> page,@Param("sql") String sql,@Param("username") String username);
+    Page<SubjectPage> researchCenterFacePageList(@Param("subjectCondition") SubjectCondition subjectCondition, Page<SubjectPage> page, @Param("sql") String sql, @Param("username") String username);
 
     /**
      * 当前用户可见的专题分页列表（公开和个人非公开）-研究中心
@@ -76,11 +77,12 @@ public interface SubjectMapper extends BaseMapper<Subject> {
      * @param username    用户名称
      * @param type        分类(1-个人;2-公开;3-个人+公开)
      * @param subjectName 专题名称
+     * @param subjectType 专题类别（1：通用专题;3：研究中心主题专题[复合专题]）
      * @param page        分页参数
      * @author lkg
      * @date 2025/2/8
      */
-    Page<Node> visibleList(@Param("username") String username, @Param("type") Integer type, @Param("subjectName") String subjectName, Page<String> page,@Param("environment") String environment,@Param("sql") String sql);
+    Page<Node> visibleList(@Param("username") String username, @Param("type") Integer type, @Param("subjectName") String subjectName, @Param("subjectType") Integer subjectType, Page<String> page, @Param("environment") String environment, @Param("sql") String sql);
 
     /**
      * 获取专题详情(包含样例文章信息)
@@ -120,7 +122,7 @@ public interface SubjectMapper extends BaseMapper<Subject> {
      */
     int ynBelowExcludeGroup(@Param("subjectId") String subjectId, @Param("sourceId") String sourceId);
 
-    List<String> getBindSubjectIds(@Param("id")String id);
+    List<String> getBindSubjectIds(@Param("id") String id);
 
     String getMinCreateTime(@Param("subjectIdList") List<String> subjectIdList);
 }

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

@@ -193,6 +193,9 @@
         <if test="subjectCondition.username!=null and subjectCondition.username != ''">
             and d.create_by = #{subjectCondition.username}
         </if>
+        <if test="subjectCondition.subjectType != null">
+            and d.subject_type = #{subjectCondition.subjectType}
+        </if>
         order by d.create_time desc
     </select>
     <select id="researchCenterFacePageList" resultType="com.zzsn.event.vo.SubjectPage">
@@ -236,6 +239,9 @@
         <if test="subjectCondition.status!=null">
             and d.status = #{subjectCondition.status}
         </if>
+        <if test="subjectCondition.subjectType!=null">
+            and d.subject_type = #{subjectCondition.subjectType}
+        </if>
         order by d.create_time desc
     </select>
 
@@ -286,6 +292,9 @@
         <if test="subjectName != null and subjectName != ''">
             and subject_name like concat('%',#{subjectName},'%')
         </if>
+        <if test="subjectType!=null">
+            and subject_type = #{subjectType}
+        </if>
         <if test="environment != null and environment != ''">
             and environment = #{environment}
         </if>

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

@@ -76,12 +76,13 @@ public interface SubjectService extends IService<Subject> {
      * @param username    用户名称
      * @param type        分类(1-个人;2-公开;3-个人+公开)
      * @param subjectName 专题名称
+     * @param subjectName 专题类别（1：通用专题;3：研究中心主题专题[复合专题]）
      * @param pageNo      当前页
      * @param pageSize    每页返回条数
      * @author lkg
      * @date 2025/2/8
      */
-    Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize, String environment,HttpServletRequest request,String flagCode);
+    Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer subjectType,  Integer pageNo, Integer pageSize, String environment,HttpServletRequest request,String flagCode);
 
     /**
      * 获取专题详情(包含样例文章信息)

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

@@ -291,7 +291,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
     }
 
     @Override
-    public Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize, String environment,HttpServletRequest request,String flagCode) {
+    public Page<Node> visiblePageList(String username, Integer type, String subjectName,Integer subjectType, Integer pageNo, Integer pageSize, String environment,HttpServletRequest request,String flagCode) {
         Page<String> page = new Page<>(pageNo, pageSize);
         String sql = "";
         if(StringUtils.isNotBlank(flagCode)){
@@ -309,7 +309,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
             log.info("visiblePageList sql:{}",sql);
         }
         log.info("visiblePageList username:{},type:{},subjectName:{},environment:{},sql:{}",username,type,subjectName,environment,sql);
-        return baseMapper.visibleList(username, type, subjectName, page,environment,sql);
+        return baseMapper.visibleList(username, type, subjectName,subjectType, page,environment,sql);
     }
 
     @Override

src/main/java/com/zzsn/event/vo/SubjectCondition.java

@@ -45,4 +45,7 @@ public class SubjectCondition {
     private String column;
     /**排序方式*/
     private String order;
+
+    /*专题类别（1：通用专题;3：研究中心主题专题[复合专题]）*/
+    private Integer subjectType = 1;
 }