Merge branch 'dev_special_subject' into develop

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java

@@ -103,6 +103,8 @@ public class SpecialSubjectDTO implements Serializable {
      */
 	private Date updatedTime;
 
-    // 扩展属性
+	/**
+	 * 标签名
+	 */
     private String tagName;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java

@@ -38,6 +38,6 @@ public interface SpecialSubjectDao extends BaseDao<SpecialSubjectEntity> {
 
     List<SpecialSubjectDTO> queryExistedList(@Param("orgId") String orgId,@Param("notList")List<String> notList);
 
-    SpecialSubjectEntity getInfo(@Param("tagId") String tagId);
+    SpecialSubjectDTO getInfo(@Param("tagId") String tagId);
 
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java

@@ -44,7 +44,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
      * 标签id
      */
 	private String tagId;
-	private String tagName;
+
     /**
      * 新增此专题的用户id
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -280,14 +280,16 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
     @Override
     public List<PreviewResultDTO> preview(PreviewFormDTO formDTO) {
         List<PreviewResultDTO> result = new ArrayList<>();
-        formDTO.getTagIdList().forEach(tagId -> {
-            PreviewResultDTO previewResultDTO = new PreviewResultDTO();
-            SpecialSubjectEntity subjectEntity = baseDao.getInfo(tagId);
-            previewResultDTO.setSpecialSubjectId(subjectEntity.getId());
-            previewResultDTO.setTagName(subjectEntity.getTagName());
-            previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize()));
-            result.add(previewResultDTO);
-        });
+        if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) {
+            formDTO.getTagIdList().forEach(tagId -> {
+                PreviewResultDTO previewResultDTO = new PreviewResultDTO();
+                SpecialSubjectDTO subject = baseDao.getInfo(tagId);
+                previewResultDTO.setSpecialSubjectId(subject.getId());
+                previewResultDTO.setTagName(subject.getTagName());
+                previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize()));
+                result.add(previewResultDTO);
+            });
+        }
         return result;
 
     }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml

@@ -28,7 +28,7 @@
             </if>
             order by ss.CREATED_TIME desc
     </select>
-    <select id="getInfo" resultType="com.epmet.entity.SpecialSubjectEntity">
+    <select id="getInfo" resultType="com.epmet.dto.SpecialSubjectDTO">
         SELECT
             ss.id,
             TAG_NAME