Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 0d5d11331f20612aa466ac95e33d59a139c81fc9
+  newTag: 8b23ae7d5ca90ea795cc82c25002beb649b1c4b7

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -415,7 +415,6 @@
         </if>
     </select>
     <select id="dynamicList" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-        WITH ranked_data AS (
         SELECT
         fd.id,
         version,
@@ -431,11 +430,9 @@
         transpond,
         ROW_NUMBER() OVER (PARTITION BY fd.id ORDER BY fd.create_time DESC) AS rn
         FROM forum_dynamic fd
-        LEFT JOIN forum_dynamic_gambit ON forum_dynamic_gambit.dynamic_id = fd.id
         WHERE is_deleted = 0
         AND root_path IS NULL
         AND fd.check_status = 1
-        AND gambit_id NOT IN (1001,1002)
         <if test="id!=null" >
             and fd.id=#{id}
         </if>
@@ -445,10 +442,6 @@
         <if test="description!=null and description!='' ">
             and fd.description like concat('%',#{description},'%')
         </if>
-        )
-        SELECT *
-        FROM ranked_data
-        WHERE rn = 1
         order by create_time desc
         LIMIT #{itemIndex}, #{pageSize}
     </select>