From b6519934fa3e43c8cbb79b3354ce2bbaf8602d9b Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 20 Sep 2023 14:20:09 +0800
Subject: [PATCH] =?UTF-8?q?add=20LoginUser=E6=B7=BB=E5=8A=A0roleIds?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/common/system/vo/LoginUser.java    | 2 ++
 .../jero/modules/system/service/impl/SysBaseApiImpl.java  | 8 ++++++++
 .../jero/modules/laws/common/constant/FieldCommon.java    | 2 ++
 .../jero/modules/laws/standard/entity/LawsNewsFeed.java   | 1 +
 .../standard/service/impl/LawsNewsFeedServiceImpl.java    | 6 ++++--
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java
index 047faa6a..10bd78fe 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java
@@ -121,4 +121,6 @@ public class LoginUser {
 	 */
 	private String nameWorkNo;
 
+	private String roleIds;
+
 }
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
index 9ebfc229..bccb8246 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
+import com.jero.common.api.CommonAPI;
 import com.jero.common.api.dto.OnlineAuthDTO;
 import com.jero.common.api.dto.message.*;
 import com.jero.common.aspect.UrlMatchEnum;
@@ -100,6 +101,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	private ISysDictService dictService;
 	@Resource
 	private ISysDictItemService sysDictItemService;
+	@Autowired
+	private CommonAPI commonAPI;
 
 	@Autowired
 	ISysCategoryService sysCategoryService;
@@ -119,6 +122,11 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 			return null;
 		}
 		BeanUtils.copyProperties(sysUser, loginUser);
+
+		// 添加用户角色
+		Set<String> roleSet = commonAPI.queryUserRoles(loginUser.getUsername());
+		loginUser.setRoleIds(StringUtils.join(roleSet, ","));
+
 		return loginUser;
 	}
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
index fc140f00..c4341c5e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
@@ -83,6 +83,8 @@ public class FieldCommon {
     public static final String _DICT_TEXT = "_dictText";
     // 标准拆分单后缀
     public static final String _STANDARD_SPLIT = "_standardSplit";
+    // 管理员id
+    public static final String ROLE_ADMIN_ID = "f6817f48af4fb3af11b9e8bf182f618b";
     // 树节点编码
     public static final String NODE_CODE = "nodeCode";
     // 中文双引号
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 40748d33..da9f79ac 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
@@ -95,6 +95,7 @@ public class LawsNewsFeed implements Serializable {
     private java.lang.Integer readCount;
     /**编辑人*/
     @ApiModelProperty(value = "编辑人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no")
     private String writer;
 
     /**推送范围标识（1-指定用户、2-全体用户）*/
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 53d21242..91b12380 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
@@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.standard.entity.LawsNewsFeed;
 import com.jero.modules.laws.standard.entity.LawsPushRange;
@@ -93,10 +94,11 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
 			// 指定用户可见
 			lawsNewsFeed.setPushRangeFlag(1);
 		}
-		// 判断是否拥有操作权限
+		// 判断是否拥有操作权限（管理员和编辑人拥有权限）
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (StringUtils.isNotBlank(lawsNewsFeed.getWriter())
-				&& !lawsNewsFeed.getWriter().equals(loginUser.getId())) {
+				&& (!lawsNewsFeed.getWriter().equals(loginUser.getId())
+				|| !loginUser.getRoleIds().contains(FieldCommon.ROLE_ADMIN_ID))) {
 			throw new JeroBootException(ResultCommon.NO_PERMISSION);
 		}
 		lawsNewsFeed.setWriter(loginUser.getId());