知识库bug

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/vo/JnbKnowledgeBaseVO.java

@@ -101,10 +101,4 @@ public class JnbKnowledgeBaseVO {
      */
     @Excel(name = "被扣除积分人id")
     private String userId;
-
-    /**
-     * 是否付费(1:已付费；0:未付费)
-     */
-    @Excel(name = "是否付费(1:已付费；0:未付费)")
-    private String purchaseStatus;
 }

sooka-jnb/src/main/resources/mapper/knowledge/JnbKnowledgeBaseMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.jnb.knowledge.mapper.JnbKnowledgeBaseMapper">
-    
+
     <resultMap type="JnbKnowledgeBase" id="JnbKnowledgeBaseResult">
         <result property="id"    column="id"    />
         <result property="titleName"    column="title_name"    />
@@ -52,13 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="watchNum != null "> and watch_num = #{watchNum}</if>
         GROUP BY jkb.id
     </select>
-    
+
     <select id="selectJnbKnowledgeBaseById" resultType="com.sooka.jnb.knowledge.vo.JnbKnowledgeBaseVO">
         <include refid="selectJnbKnowledgeBaseVo"/>
         and jkb.id = #{id}
         GROUP BY jkb.id
     </select>
-        
+
     <insert id="insertJnbKnowledgeBase" parameterType="com.sooka.jnb.knowledge.vo.JnbKnowledgeBaseVO" useGeneratedKeys="true" keyProperty="id">
         <selectKey keyProperty="id" resultType="java.lang.Long" order="AFTER">
             SELECT LAST_INSERT_ID() AS id
@@ -141,28 +141,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             jkb.update_by,
             jkb.update_time,
             GROUP_CONCAT( jkbi.id ) AS imgId,
-            GROUP_CONCAT( jkbi.img_url ) AS imgUrlList,
-            CASE
-
-                WHEN jso.user_id IS NOT NULL THEN
-                    '1' ELSE '0'
-                END AS purchase_status
+            GROUP_CONCAT( jkbi.img_url ) AS imgUrlList
         FROM
             jnb_knowledge_base jkb
                 LEFT JOIN jnb_knowledge_base_img jkbi ON jkb.id = jkbi.knowledge_id
-                AND jkbi.del_flag = 0
-                LEFT JOIN jnb_score_operate jso ON jkb.id = jso.relevance_data_id and jso.user_id = jkb.create_id
         WHERE
-            jkb.del_flag = 0 and popular = 1
+            jkb.del_flag = 0
+          AND popular = 1
+          AND jkbi.del_flag = 0
         GROUP BY
             jkb.id
-        order by create_time,watch_num,like_num desc
+        ORDER BY
+            create_time,
+            watch_num,
+            like_num DESC
     </select>
 
     <select id="knowledgePayList" parameterType="JnbKnowledgeBase" resultType="com.sooka.jnb.knowledge.vo.JnbKnowledgeBaseVO">
         SELECT
             kb.*,
-            CONCAT( jkbi.img_url ) as imgUrlList
+            GROUP_CONCAT( jkbi.img_url ) AS imgUrlList
         FROM
             jnb_knowledge_base kb
                 LEFT JOIN jnb_score_operate so ON so.relevance_data_id = kb.id
@@ -170,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             so.relevance = 1
           AND kb.del_flag = 0
+          AND jkbi.del_flag = 0
           AND so.user_id = #{createId}
         GROUP BY
             kb.id
@@ -177,4 +176,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateWatchNum">
         update jnb_knowledge_base set watch_num = watch_num + 1 where id = #{id}
     </update>
-</mapper>
+</mapper>