修改bug

src/main/java/org/rcisoft/business/cmsnews/dao/CmsNewsRepository.java

@@ -50,7 +50,7 @@ public interface CmsNewsRepository extends CyBaseMapper<CmsNews> {
 
     IPage<CmsVideo> listTopVideoAdmin(CyPageInfo<CmsNews> paginationUtility, @Param("entity") CmsVideo cmsVideo);
 
-    IPage<CmsNews> listByClassificationAdmin(CyPageInfo<CmsNews> paginationUtility, CmsNews cmsNews);
+    IPage<CmsNews> listByClassificationAdmin(CyPageInfo<CmsNews> paginationUtility, @Param("entity") CmsNews cmsNews);
 
     IPage<CmsNews> listByClassificationMerchants(CyPageInfo<CmsNews> paginationUtility, @Param("entity") CmsNews cmsNews);
 }

src/main/java/org/rcisoft/business/cmsvideo/dao/CmsVideoRepository.java

@@ -30,7 +30,7 @@ public interface CmsVideoRepository extends CyBaseMapper<CmsVideo> {
 
     IPage<CmsVideo> businessAdminsPaginatedQuery(CyPageInfo<CmsVideo> paginationUtility, @Param("entity") CmsVideo cmsVideo);
 
-    IPage<CmsVideo> listByClassificationAdmin(CyPageInfo<CmsVideo> paginationUtility, CmsVideo cmsVideo);
+    IPage<CmsVideo> listByClassificationAdmin(CyPageInfo<CmsVideo> paginationUtility, @Param("entity") CmsVideo cmsVideo);
 
     IPage<CmsVideo> listByClassificationMerchants(CyPageInfo<CmsVideo> paginationUtility, @Param("entity") CmsVideo cmsVideo);
 }

src/main/resources/mapper/business/cmsnews/mapper/CmsNewsMapper.xml

@@ -430,25 +430,28 @@
     </select>
     <select id="listByClassificationAdmin" resultType="org.rcisoft.business.cmsnews.entity.CmsNews">
         SELECT cn.*,
-               SUM(cn.click_through_rate) AS readNum
+        SUM(cn.click_through_rate) AS readNum
         FROM (SELECT cn.*,
-                     cpc.click_through_rate AS click_through_rate,
-                     oi.path                AS path
-              FROM cms_news cn
-                       LEFT JOIN cms_unit_new_video cunv
-                                 ON cn.business_id = cunv.news_video_id AND cunv.type = 0
-                       LEFT JOIN sys_user_unit suu ON cunv.unit_id = suu.unit_id
-                       LEFT JOIN sys_user su ON suu.user_id = su.business_id
-                       LEFT JOIN oss_info oi ON cn.picture_id = oi.business_id
-                       LEFT JOIN cms_price_click cpc
-                                 ON cpc.news_video_id = cn.business_id AND cpc.del_flag = 0 AND cpc.type = 0
-                                     AND cpc.user_id = su.business_id
-              WHERE 1 = 1
-                AND cn.del_flag = 0
-                AND cn.flag = 1
-              GROUP BY cn.business_id, cpc.business_id
-              ORDER BY cn.is_top
-                      DESC, cn.update_date DESC) cn
+        cpc.click_through_rate AS click_through_rate,
+        oi.path AS path
+        FROM cms_news cn
+        LEFT JOIN cms_unit_new_video cunv
+        ON cn.business_id = cunv.news_video_id AND cunv.type = 0
+        LEFT JOIN sys_user_unit suu ON cunv.unit_id = suu.unit_id
+        LEFT JOIN sys_user su ON suu.user_id = su.business_id
+        LEFT JOIN oss_info oi ON cn.picture_id = oi.business_id
+        LEFT JOIN cms_price_click cpc
+        ON cpc.news_video_id = cn.business_id AND cpc.del_flag = 0 AND cpc.type = 0
+        AND cpc.user_id = su.business_id
+        WHERE 1 = 1
+        <if test="entity.unitId != null and entity.unitId != ''">
+            AND cunv.unit_id = #{entity.unitId}
+        </if>
+        AND cn.del_flag = 0
+        AND cn.flag = 1
+        GROUP BY cn.business_id, cpc.business_id
+        ORDER BY cn.is_top
+        DESC, cn.update_date DESC) cn
         GROUP BY cn.business_id
     </select>
     <select id="listByClassificationMerchants" resultType="org.rcisoft.business.cmsnews.entity.CmsNews">

src/main/resources/mapper/business/cmsvideo/mapper/CmsVideoMapper.xml

@@ -189,25 +189,29 @@
     </select>
     <select id="listByClassificationAdmin" resultType="org.rcisoft.business.cmsvideo.entity.CmsVideo">
         SELECT cv.*,
-               SUM(cv.click_through_rate) AS readNum
+        SUM(cv.click_through_rate) AS readNum
         FROM (SELECT cv.*,
-                     cpc.click_through_rate AS click_through_rate,
-                     oi1.path               AS path,
-                     oi.path                AS defaultUrl
-              FROM cms_video cv
-                       LEFT JOIN cms_unit_new_video cunv ON cv.business_id = cunv.news_video_id AND cunv.type = 1
-                       LEFT JOIN sys_user_unit suu ON cunv.unit_id = suu.unit_id
-                       LEFT JOIN sys_user su ON suu.user_id = su.business_id
-                  AND su.del_flag = 0
-                  AND su.flag = 1
-                       LEFT JOIN cms_price_click cpc
-                                 ON cpc.news_video_id = cv.business_id AND cpc.del_flag = 0 AND cpc.type = 1
-                       LEFT JOIN oss_info oi ON cv.video_url_id = oi.business_id
-                       LEFT JOIN oss_info oi1 ON cv.default_url = oi1.business_id
-              WHERE 1 = 1
-                AND cv.del_flag = 0
-              GROUP BY cv.business_id, cpc.business_id
-              order by cv.flag DESC, cv.update_date DESC) cv
+        cpc.click_through_rate AS click_through_rate,
+        oi1.path AS path,
+        oi.path AS defaultUrl
+        FROM cms_video cv
+        LEFT JOIN cms_unit_new_video cunv ON cv.business_id = cunv.news_video_id AND cunv.type = 1
+        LEFT JOIN sys_user_unit suu ON cunv.unit_id = suu.unit_id
+        LEFT JOIN sys_user su ON suu.user_id = su.business_id
+        AND su.del_flag = 0
+        AND su.flag = 1
+        LEFT JOIN cms_price_click cpc
+        ON cpc.news_video_id = cv.business_id AND cpc.del_flag = 0 AND cpc.type = 1
+        LEFT JOIN oss_info oi ON cv.video_url_id = oi.business_id
+        LEFT JOIN oss_info oi1 ON cv.default_url = oi1.business_id
+        WHERE 1 = 1
+        <if test="entity.unitId !=null and entity.unitId != '' ">
+            AND cunv.unit_id = #{entity.unitId}
+            AND suu.unit_id = #{entity.unitId}
+        </if>
+        AND cv.del_flag = 0
+        GROUP BY cv.business_id, cpc.business_id
+        order by cv.flag DESC, cv.update_date DESC) cv
         GROUP BY cv.business_id
     </select>
     <select id="listByClassificationMerchants" resultType="org.rcisoft.business.cmsvideo.entity.CmsVideo">