From 09a6ee13cb61c882a88db1b86d818f9129124491 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 13 May 2025 18:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E5=85=BB=E7=A7=91=E6=99=AE=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/nutrition/domain/HealthPopularScience.java       | 3 +++
 .../service/impl/HealthPopularScienceServiceImpl.java     | 3 +++
 .../mapper/nutrition/HealthPopularScienceMapper.xml       | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java
index 0634525..283d840 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java
@@ -83,6 +83,9 @@ public class HealthPopularScience extends BaseEntity {
     /** 是否删除 0-正常 2-删除 */
     private Long delFlag;
 
+    @ApiModelProperty("慢性病id数组")
+    private String[] chronicIdArray;
+
     @ApiModelProperty("慢性病id 多个用,分割")
     private String chronicIds;
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java
index 2f48b7e..cfd277c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java
@@ -52,6 +52,9 @@ public class HealthPopularScienceServiceImpl implements IHealthPopularScienceSer
      */
     @Override
     public List<HealthPopularScience> selectHealthPopularScienceList(HealthPopularScience healthPopularScience) {
+        String chronicIds = healthPopularScience.getChronicIds();
+        String[] chronicIdArray = chronicIds.split(",");
+        healthPopularScience.setChronicIdArray(chronicIdArray);
         return healthPopularScienceMapper.selectHealthPopularScienceList(healthPopularScience);
     }
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml
index aef705f..7c16d90 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             hps.del_flag = 0
             <if test="articleId != null "> and hps.article_id = #{articleId}</if>
-            <if test="articleTitle != null  and articleTitle != ''"> and hps.article_title = #{articleTitle}</if>
+            <if test="articleTitle != null  and articleTitle != ''"> and hps.article_title like concat('%', #{articleTitle}, '%')</if>
             <if test="coverPhoto != null  and coverPhoto != ''"> and hps.cover_photo = #{coverPhoto}</if>
             <if test="articleType != null "> and hps.article_type = #{articleType}</if>
             <if test="articleContent != null  and articleContent != ''"> and hps.article_content = #{articleContent}</if>
@@ -48,6 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ifPushed != null "> and hps.if_pushed = #{ifPushed}</if>
             <if test="pushTime != null "> and hps.push_time = #{pushTime}</if>
             <if test="summary != null  and summary != ''"> and hps.summary = #{summary}</if>
+            <if test="chronicIdArray != null  and chronicIdArray != ''">
+                and hac.chronic_id in
+                <foreach item="chronicId" collection="chronicIdArray" open="(" separator="," close=")">
+                    #{chronicId}
+                </foreach>
+            </if>
         </where>
         GROUP BY
             hps.article_id,