From b33c94c273d6afb40cf848a77077c16c2c841f5b Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 30 Jul 2024 16:30:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(87708):=20=E5=8A=A8=E6=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF-=E4=B8=8D=E9=80=89=E6=8B=A9=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=8C=E6=89=80=E6=9C=89=E4=BA=BA=E9=83=BD?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/standard/entity/LawsNewsFeed.java    |  4 +++
 .../standard/mapper/LawsNewsFeedMapper.java   |  8 ++---
 .../mapper/xml/LawsNewsFeedMapper.xml         | 34 ++++++++++---------
 .../service/impl/LawsNewsFeedServiceImpl.java |  7 +++-
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
index 8ce9d67b..c3fac645 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
@@ -121,4 +121,8 @@ public class LawsNewsFeed implements Serializable {
     @ApiModelProperty(value = "是否可以编辑和删除")
     @TableField(exist = false)
     private Boolean isEditAndRemove;
+
+    @ApiModelProperty(value = "是否管理员")
+    @TableField(exist = false)
+    private String isAdmin;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsNewsFeedMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsNewsFeedMapper.java
index d5339ba8..6b9e334e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsNewsFeedMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsNewsFeedMapper.java
@@ -1,13 +1,13 @@
 package com.jero.modules.laws.standard.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.modules.laws.standard.entity.LawsNewsFeed;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.jero.modules.laws.standard.entity.LawsNewsFeed;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * @Description: 动态消息
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
index 1eb15ab1..a1a55bf3 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
@@ -18,20 +18,22 @@
         <result column="read_count" property="readCount" />
     </resultMap>
     <select id="getPageList" resultType="com.jero.modules.laws.standard.entity.LawsNewsFeed">
-        SELECT DISTINCT lnf.*
-        FROM laws_news_feed lnf
-                 LEFT JOIN laws_push_range lpr ON lnf.id = lpr.unique_relation_flag
-        WHERE lnf.del_flag = 0
-        <if test="param.roleCode == 'admin'">
-            AND (lnf.release_status = 1 OR lnf.writer = #{param.writer})
-        </if>
-        <if test="param.roleCode != 'admin'">
-            AND ((lnf.release_status = 1 AND (lpr.user_id = #{param.writer} OR lnf.push_range_flag = 2))
-                     OR lnf.writer = #{param.writer})
-        </if>
-        <if test="param.dynamicHeading != null and param.dynamicHeading != ''">
-           AND lnf.dynamic_heading LIKE CONCAT('%', #{param.dynamicHeading}, '%')
-        </if>
-        ORDER BY release_time DESC
+        select *
+        from (select f.*, group_concat(r.user_id) user_id
+              from laws_news_feed f
+                       left join laws_push_range r on f.id = r.unique_relation_flag
+              group by f.id) t
+        <where>
+            del_flag = 0
+            <if test="param.dynamicHeading != null and param.dynamicHeading != ''">
+                and dynamic_heading like concat('%', #{param.dynamicHeading}, '%')
+            </if>
+           and (writer = #{param.writer}
+            <if test="param.isAdmin != null and param.isAdmin != ''">
+                or release_status = 1
+            </if>
+            or (release_status = 1 and user_id like concat('%', #{param.writer}, '%'))
+            )
+        </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
index cca9c36a..623f7d5d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
@@ -68,7 +68,12 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
     @Override
     public IPage<LawsNewsFeed> queryPage(LawsNewsFeed lawsNewsFeed, Integer pageNo, Integer pageSize) {
         Page<LawsNewsFeed> page = new Page<>(pageNo, pageSize);
-		setQueryParam(lawsNewsFeed);
+//		setQueryParam(lawsNewsFeed);
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		lawsNewsFeed.setWriter(loginUser.getId());
+		if (loginUser.getRoleIds().contains("admin")){
+			lawsNewsFeed.setIsAdmin("1");
+		}
 		IPage<LawsNewsFeed> pageList = lawsNewsFeedMapper.getPageList(page, lawsNewsFeed);
 		setResultData(pageList.getRecords());
 		return pageList;