From d9d4e3bf8f8314aa7ad596338b7ad7a2012c9e09 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Dec 2023 15:56:17 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2-=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualReportServiceImpl.java       | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index c3e6d249..34e095ef 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -252,29 +252,23 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 break;
             case COLLECT_LEADER_APPROVAL:
                 wrapper.eq(ProcessEsAnnualReport::getCollectUserLeader, userId);
-                wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
                 annualReportDataVO.setDataList(list(wrapper));
                 break;
             case CONTACT_USER_COLLECT:
                 wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
-                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
                 wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
-                wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
                 annualReportDataVO.setDataList(list(wrapper));
                 break;
             case CONTACT_USER_LEADER_APPROVAL:
                 wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
-                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
                 wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
-                wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
-                annualReportDataVO.setDataList(list(wrapper));
                 break;
             case STANDARD_ENGINEER_COLLECT:
-                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
-                wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
-                annualReportDataVO.setDataList(list(wrapper));
                 break;
         }
+        wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
+        wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
+        annualReportDataVO.setDataList(list(wrapper));
         return annualReportDataVO;
     }