From 50eb0d5c663c37b6a4f4ff8a0d87ee5dc64f580b Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Tue, 5 Mar 2024 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/safeproduct/entity/SystemFileEntity.java  |  3 +++
 .../service/impl/SystemFileServiceImpl.java         |  3 +++
 .../resources/file/体系文件审批.bpmn20.xml    | 21 ++++++++++++---------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java
index f88a16e..757a635 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java
@@ -50,4 +50,7 @@ public class SystemFileEntity extends TenantEntity {
 	@ApiModelProperty(value = "工作流ID")
 	private String flowId;
 
+	@ApiModelProperty("创建人")
+	private Long createUser;
+
 }
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java
index 5dc22c6..6245f4a 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java
@@ -73,6 +73,9 @@ public class SystemFileServiceImpl extends BaseServiceImpl<SystemFileMapper, Sys
 			if (null != req.getFileStatus()) {
 				eq("file_status", req.getFileStatus());
 			}
+			if(Func.isNotEmpty(req.getStatus())) {
+				eq("status", req.getStatus());
+			}
 			if (StringUtil.isNotBlank(req.getFileName())) {
 				like("file_name", req.getFileName());
 			}
diff --git a/hzims-service/safeproduct/src/main/resources/file/体系文件审批.bpmn20.xml b/hzims-service/safeproduct/src/main/resources/file/体系文件审批.bpmn20.xml
index a9195ef..fa99188 100644
--- a/hzims-service/safeproduct/src/main/resources/file/体系文件审批.bpmn20.xml
+++ b/hzims-service/safeproduct/src/main/resources/file/体系文件审批.bpmn20.xml
@@ -6,8 +6,11 @@
         <flowable:formProperty id="assignee" name="assignee" type="string" required="true"></flowable:formProperty>
       </extensionElements>
     </startEvent>
-    <userTask id="sid-71423AA7-A1EF-4F95-BB7B-1E97FCC9164C" name="审核人审批
-" flowable:formFieldValidation="true" flowable:candidateUsers="${approver}"></userTask>
+    <userTask id="sid-71423AA7-A1EF-4F95-BB7B-1E97FCC9164C" name="审核人审批 " flowable:candidateGroups="SystemFileApprover" flowable:formFieldValidation="true">
+      <extensionElements>
+        <flowable:taskListener event="create" class="org.springblade.flow.engine.listener.DynamicTaskUserListener"></flowable:taskListener>
+      </extensionElements>
+    </userTask>
     <exclusiveGateway id="sid-4AF1B2EB-29BE-4505-9295-D28FAEA3D998" name="审批"></exclusiveGateway>
     <endEvent id="sid-A9D2F619-A88E-44F1-A1C7-03C75B3C6B14" name="结束"></endEvent>
     <endEvent id="sid-FEF7443A-B328-4BBD-9A84-180D335F498E" name="结束"></endEvent>
@@ -38,16 +41,16 @@
         <omgdc:Bounds height="28.0" width="28.0" x="381.0" y="495.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-C2DD2501-6266-4819-9BC4-36148F90FCAD" id="BPMNEdge_sid-C2DD2501-6266-4819-9BC4-36148F90FCAD">
-        <omgdi:waypoint x="309.9499999999926" y="330.1843173431734"></omgdi:waypoint>
-        <omgdi:waypoint x="375.42592592592536" y="330.4259259259259"></omgdi:waypoint>
+        <omgdi:waypoint x="309.9499999998759" y="330.0"></omgdi:waypoint>
+        <omgdi:waypoint x="375.0" y="330.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-C7178FEF-98F6-44A5-A354-7BB83575C565" id="BPMNEdge_sid-C7178FEF-98F6-44A5-A354-7BB83575C565">
-        <omgdi:waypoint x="414.50393738140417" y="330.43987341772157"></omgdi:waypoint>
-        <omgdi:waypoint x="540.0000670136147" y="330.0440062513792"></omgdi:waypoint>
+        <omgdi:waypoint x="414.9437303581345" y="330.0"></omgdi:waypoint>
+        <omgdi:waypoint x="540.0" y="330.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FACD1E29-B375-4110-B885-E73251B3ED09" id="BPMNEdge_sid-FACD1E29-B375-4110-B885-E73251B3ED09">
-        <omgdi:waypoint x="395.44662921348316" y="349.4978804042673"></omgdi:waypoint>
-        <omgdi:waypoint x="395.03907547698566" y="495.00005488730324"></omgdi:waypoint>
+        <omgdi:waypoint x="395.0" y="349.94443048576215"></omgdi:waypoint>
+        <omgdi:waypoint x="395.0" y="495.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B129759-4330-4970-B29A-8C28FB138B9E" id="BPMNEdge_sid-7B129759-4330-4970-B29A-8C28FB138B9E">
         <omgdi:waypoint x="134.9499990675947" y="330.0"></omgdi:waypoint>
@@ -55,4 +58,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>
\ No newline at end of file