From 30c4518398b2e3a89cf6d17d8c0f76abfee6c279 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 20 Sep 2023 17:48:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF-?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/standard/entity/LawsNewsFeed.java    |  4 ++
 .../service/impl/LawsNewsFeedServiceImpl.java | 46 ++++++++++++++-----
 2 files changed, 38 insertions(+), 12 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 653af6b2..afb4208d 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
@@ -106,4 +106,8 @@ public class LawsNewsFeed implements Serializable {
     @ApiModelProperty(value = "推送范围")
     @TableField(exist = false)
     private String pushRange;
+
+    @ApiModelProperty(value = "是否可以编辑和删除")
+    @TableField(exist = false)
+    private Boolean isEditAndRemove;
 }
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 9efb93cf..ac8dde88 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
@@ -53,20 +53,14 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
      * @param lawsNewsFeed
      * @param pageNo
      * @param pageSize
-     * @param req
      * @return
      */
     @Override
     public IPage<LawsNewsFeed> queryPage(LawsNewsFeed lawsNewsFeed, Integer pageNo, Integer pageSize) {
         Page<LawsNewsFeed> page = new Page<>(pageNo, pageSize);
-		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		lawsNewsFeed.setWriter(loginUser.getId());
-		if (loginUser.getRoleIds().contains(FieldCommon.ROLE_ADMIN)) {
-			lawsNewsFeed.setRoleCode(FieldCommon.ROLE_ADMIN);
-		} else {
-			lawsNewsFeed.setRoleCode("other");
-		}
+		setQueryParam(lawsNewsFeed);
 		IPage<LawsNewsFeed> pageList = lawsNewsFeedMapper.getPageList(page, lawsNewsFeed);
+		setResultData(pageList.getRecords());
 		return pageList;
     }
 
@@ -74,11 +68,22 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
      * 列表查询
      *
      * @param lawsNewsFeed
-     * @param req
      * @return
      */
     @Override
     public List<LawsNewsFeed> queryList(LawsNewsFeed lawsNewsFeed) {
+		setQueryParam(lawsNewsFeed);
+		List<LawsNewsFeed> pageList = lawsNewsFeedMapper.getPageList(lawsNewsFeed);
+		setResultData(pageList);
+        return pageList;
+    }
+
+	/**
+	 * @Author: liao
+	 * @Date: 2023/9/20 17:41
+	 * @Description: 设置查询条件
+	 **/
+	private void setQueryParam(LawsNewsFeed lawsNewsFeed) {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		lawsNewsFeed.setWriter(loginUser.getId());
 		if (loginUser.getRoleIds().contains(FieldCommon.ROLE_ADMIN)) {
@@ -86,9 +91,26 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
 		} else {
 			lawsNewsFeed.setRoleCode("other");
 		}
-		List<LawsNewsFeed> pageList = lawsNewsFeedMapper.getPageList(lawsNewsFeed);
-        return pageList;
-    }
+	}
+
+	/**
+	 * @Author: liao
+	 * @Date: 2023/9/20 17:42
+	 * @Description: 设置返回结果
+	 **/
+	private void setResultData(List<LawsNewsFeed> pageList) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		pageList.forEach(lawsNewsFeed -> {
+			if (loginUser.getRoleIds().contains(FieldCommon.ROLE_ADMIN)
+					|| loginUser.getId().equals(lawsNewsFeed.getWriter())) {
+				// 可以编辑和删除
+				lawsNewsFeed.setIsEditAndRemove(true);
+			} else {
+				// 不能编辑和删除
+				lawsNewsFeed.setIsEditAndRemove(false);
+			}
+		});
+	}
 
 	/**
 	 * 保存