From c8701bcf987527d50d00a793fd361dec0d2aa1e1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 20 Oct 2023 10:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA-=E5=8F=AA=E8=83=BD=E5=AF=BC=E5=87=BA=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E7=9A=84=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportWriteEOServiceImpl.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 faa9def9d..7efcac338 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
@@ -496,6 +496,17 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 //			wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
 //		}
 		//----------------------------------------------------------------------------------------
+
+		//草稿只能自己查看，已提交的所有人都可以查看
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		wrapper.and(q->{
+			q.eq(LawsMonthlyReportWriteEO::getSaveState, SaveStateEnum.SUBMIT.getValue());
+			q.or().isNull(LawsMonthlyReportWriteEO::getSaveState);
+			q.or(queryWrapper->{
+				queryWrapper.eq(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
+				queryWrapper.eq(LawsMonthlyReportWriteEO::getSaveState,SaveStateEnum.SAVE.getValue());
+			});
+		});
 		List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = this.list(wrapper);
 
 		if(lawsMonthlyReportWriteEOS.size() == 0){