From b08f181c55f194b34ca8213674941baba88eb9ad Mon Sep 17 00:00:00 2001
From: sunzy <62333657+sunzhengyu99@users.noreply.github.com>
Date: Mon, 29 May 2023 21:08:20 +0800
Subject: [PATCH 1/3] Update ArticleMapper.xml

fixselectArticlesByTagName method's bug
---
 src/main/java/mapper/ArticleMapper.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/mapper/ArticleMapper.xml b/src/main/java/mapper/ArticleMapper.xml
index d17086c..378fd90 100644
--- a/src/main/java/mapper/ArticleMapper.xml
+++ b/src/main/java/mapper/ArticleMapper.xml
@@ -125,7 +125,9 @@
         where topic.id = vtt.id_topic and topic.topic_uri = #{topicName}))) order by updated_time desc
     </select>
     <select id="selectArticlesByTagName" resultMap="DTOResultMap">
-        select art.*,su.nickname,su.avatar_url from forest_article art join forest_user su on art.article_author_id = su.id order by updated_time desc
+        select art.*,su.nickname,su.avatar_url from forest_article art join forest_user su on art.article_author_id = su.id where
+        FIND_IN_SET(#{tagName},art.article_tags) > 0
+        order by updated_time desc
     </select>
     <select id="selectUserArticles" resultMap="DTOResultMap">
         select art.*,su.nickname,su.avatar_url from forest_article art join forest_user su on su.id = #{idUser}
@@ -162,4 +164,4 @@
         and FIND_IN_SET('公告',art.article_tags) > 0
         order by updated_time desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

From 3fefcce9c18e29e3104de17a72012d18374009b7 Mon Sep 17 00:00:00 2001
From: sunzy <62333657+sunzhengyu99@users.noreply.github.com>
Date: Sun, 11 Jun 2023 12:32:59 +0800
Subject: [PATCH 2/3] Update TagServiceImpl.java

Remove redundant code
---
 .../java/com/rymcu/forest/service/impl/TagServiceImpl.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java
index 6354826..0f53f6f 100644
--- a/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java
@@ -131,9 +131,6 @@ public class TagServiceImpl extends AbstractService<Tag> implements TagService {
             } else {
                 tag.setTagIconPath(tag.getTagIconPath());
             }
-            tag.setTagStatus(tag.getTagStatus());
-            tag.setTagDescription(tag.getTagDescription());
-            tag.setTagReservation(tag.getTagReservation());
             tag.setCreatedTime(new Date());
             tag.setUpdatedTime(tag.getCreatedTime());
             result = tagMapper.insertSelective(tag);

From 9b095af68655dece5c13beff38e07ee4c636658b Mon Sep 17 00:00:00 2001
From: gogogjl <gjl649584217@163.com>
Date: Wed, 12 Jul 2023 22:51:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E5=BC=82=E5=B8=B8,=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=87=E6=B3=A8=E6=8F=90=E7=A4=BA,=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=8F=AF=E8=83=BD=E6=9C=89=E8=AF=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forest/lucene/service/impl/PortfolioLuceneServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/rymcu/forest/lucene/service/impl/PortfolioLuceneServiceImpl.java b/src/main/java/com/rymcu/forest/lucene/service/impl/PortfolioLuceneServiceImpl.java
index 07bc0ee..7b31f3e 100644
--- a/src/main/java/com/rymcu/forest/lucene/service/impl/PortfolioLuceneServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/lucene/service/impl/PortfolioLuceneServiceImpl.java
@@ -56,7 +56,7 @@ public class PortfolioLuceneServiceImpl implements PortfolioLuceneService {
             int totalCount = list.size();
             int perThreadCount = 3000;
             // 加1避免线程池的参数为0
-            int threadCount = totalCount / perThreadCount + (totalCount % perThreadCount == 0 ? 0 : 1);
+            int threadCount = totalCount / perThreadCount + (totalCount % perThreadCount == 0 ? 1 : 0);
             ExecutorService pool = Executors.newFixedThreadPool(threadCount);
             CountDownLatch countDownLatch1 = new CountDownLatch(1);
             CountDownLatch countDownLatch2 = new CountDownLatch(threadCount);