From 1c1efef5d95a333744d101685ab07944aa877ade Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 17 Aug 2022 11:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E5=AF=BC=E5=87=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 5e947cab4..dc389d037 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -414,6 +414,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getIds())){
 			wrapper.in(LawsMonthlyReportWriteEO::getId,Arrays.asList(lawsMonthlyReportWriteEO.getIds().split(",")));
 		}
+		//管理员查看全部数据,其余人只能查看自己的数据
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
+		if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
+			wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
+		}
 		List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = this.list(wrapper);
 
 		List<String> lawsMonthlyReportIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList());
@@ -591,7 +597,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			//内容英文版
 			XWPFDocument documentContentEn = new XWPFDocument();
 			FileOutputStream outContentEn = new FileOutputStream(wordFileContentEn);
-			wordContent(lawsMonthlyReportWriteEOS, lawsMonthlyReportTitleTemplateEOS, reportTitleOneList, titleCN, documentContentEn,CutEnum.EN.getValue());
+			wordContent(lawsMonthlyReportWriteEOS, lawsMonthlyReportTitleTemplateEOS, reportTitleOneList, titleEN, documentContentEn,CutEnum.EN.getValue());
 			documentContentEn.write(outContentEn);
 
 		} catch (IOException e) {