From 8fd1fa53d1c0ac4591c0993b3b78a43db5ba4b9d Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Mon, 5 Feb 2024 17:49:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E4=BC=9A=E7=AD=BE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/DeleteSequenceMultiInstanceCmd.java   |   9 +++++--
 .../impl/ActProcessDefinitionServiceImpl.java |  23 ++++++++++++------
 .../service/impl/ActTaskServiceImpl.java      |  16 ++++++++++--
 .../service/impl/WorkflowUserServiceImpl.java |   9 ++++---
 script/bpmn/请假流程（会签）-leave5.zip       | Bin 1770 -> 1342 bytes
 script/bpmn/请假流程（包容网关）-leave4.zip   | Bin 2232 -> 1590 bytes
 script/bpmn/请假流程（并行网关）-leave3.zip   | Bin 2156 -> 1520 bytes
 .../bpmn/请假流程（边界定时任务）-leave7.zip  | Bin 2172 -> 0 bytes
 8 files changed, 42 insertions(+), 15 deletions(-)
 delete mode 100644 script/bpmn/请假流程（边界定时任务）-leave7.zip

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java
index e7edbd090..6773eefff 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java
@@ -1,5 +1,6 @@
 package org.dromara.workflow.flowable.cmd;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.AllArgsConstructor;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
@@ -51,10 +52,14 @@ public class DeleteSequenceMultiInstanceCmd implements Command<Void> {
         ExecutionEntityManager executionEntityManager = CommandContextUtil.getExecutionEntityManager();
         ExecutionEntity entity = executionEntityManager.findById(executionId);
         // 设置流程变量
-        List<Long> userIds = (List<Long>) entity.getVariable(assigneeList);
+        List<Long> userIds = new ArrayList<>();
+        List<Object> variable = (List<Object>) entity.getVariable(assigneeList);
+        for (Object o : variable) {
+            userIds.add(Long.valueOf(o.toString()));
+        }
         List<Long> userIdList = new ArrayList<>();
         userIds.forEach(e -> {
-            Long userId = assignees.stream().filter(id -> id.equals(e)).findFirst().orElse(null);
+            Long userId = assignees.stream().filter(id -> ObjectUtil.equals(id, e)).findFirst().orElse(null);
             if (userId == null) {
                 userIdList.add(e);
             }
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
index 5c38fad8f..009a1ad29 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
@@ -36,7 +36,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.ZipInputStream;
@@ -295,17 +294,25 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
             InputStream inputStream = file.getInputStream();
             Deployment deployment;
             if (FlowConstant.ZIP.equals(suffix)) {
-                // zip
                 deployment = repositoryService.createDeployment()
                     .tenantId(TenantHelper.getTenantId())
                     .addZipInputStream(new ZipInputStream(inputStream)).name(processName).key(processKey).category(categoryCode).deploy();
-            } else if (Arrays.asList(ResourceNameUtil.BPMN_RESOURCE_SUFFIXES).contains(filename)) {
-                // xml 或 bpmn
-                deployment = repositoryService.createDeployment()
-                    .tenantId(TenantHelper.getTenantId())
-                    .addInputStream(filename, inputStream).name(processName).key(processKey).category(categoryCode).deploy();
             } else {
-                throw new ServiceException("文件类型上传错误！");
+                String[] list = ResourceNameUtil.BPMN_RESOURCE_SUFFIXES;
+                boolean flag = false;
+                for (String str : list) {
+                    if (filename.contains(str)) {
+                        flag = true;
+                        break;
+                    }
+                }
+                if (flag) {
+                    deployment = repositoryService.createDeployment()
+                        .tenantId(TenantHelper.getTenantId())
+                        .addInputStream(filename, inputStream).name(processName).key(processKey).category(categoryCode).deploy();
+                } else {
+                    throw new ServiceException("文件类型上传错误！");
+                }
             }
             // 更新分类
             ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult();
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 59348e5ae..19c5de554 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -492,7 +492,13 @@ public class ActTaskServiceImpl implements IActTaskService {
      */
     @Override
     public boolean addMultiInstanceExecution(AddMultiBo addMultiBo) {
-        Task task = taskService.createTaskQuery().taskId(addMultiBo.getTaskId()).taskTenantId(TenantHelper.getTenantId()).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())).singleResult();
+        TaskQuery taskQuery = taskService.createTaskQuery();
+        taskQuery.taskId(addMultiBo.getTaskId());
+        taskQuery.taskTenantId(TenantHelper.getTenantId());
+        if (!LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin()) {
+            taskQuery.taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId()));
+        }
+        Task task = taskQuery.singleResult();
         if (ObjectUtil.isEmpty(task)) {
             throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
         }
@@ -535,7 +541,13 @@ public class ActTaskServiceImpl implements IActTaskService {
      */
     @Override
     public boolean deleteMultiInstanceExecution(DeleteMultiBo deleteMultiBo) {
-        Task task = taskService.createTaskQuery().taskId(deleteMultiBo.getTaskId()).taskTenantId(TenantHelper.getTenantId()).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId())).singleResult();
+        TaskQuery taskQuery = taskService.createTaskQuery();
+        taskQuery.taskId(deleteMultiBo.getTaskId());
+        taskQuery.taskTenantId(TenantHelper.getTenantId());
+        if (!LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin()) {
+            taskQuery.taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId()));
+        }
+        Task task = taskQuery.singleResult();
         if (ObjectUtil.isEmpty(task)) {
             throw new ServiceException(FlowConstant.MESSAGE_CURRENT_TASK_IS_NULL);
         }
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
index 647e6d4d7..e30e553eb 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
@@ -99,13 +99,16 @@ public class WorkflowUserServiceImpl implements IWorkflowUserService {
         if (multiInstance == null) {
             return Collections.emptyList();
         }
-        List<Long> assigneeList = null;
+        List<Long> assigneeList = new ArrayList<>();
         if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
-            assigneeList = (List<Long>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
+            List<Object> variable = (List<Object>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
+            for (Object o : variable) {
+                assigneeList.add(Long.valueOf(o.toString()));
+            }
         }
 
         if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
-            List<Long> userIds = StreamUtils.filter(assigneeList, e -> !e.toString().equals(task.getAssignee()));
+            List<Long> userIds = StreamUtils.filter(assigneeList, e -> !String.valueOf(e).equals(task.getAssignee()));
             List<SysUserVo> sysUsers = null;
             if (CollectionUtil.isNotEmpty(userIds)) {
                 sysUsers = sysUserMapper.selectVoBatchIds(userIds);
diff --git a/script/bpmn/请假流程（会签）-leave5.zip b/script/bpmn/请假流程（会签）-leave5.zip
index a5e03efce37dc78f36fb79effe9dd404461b99ce..afe031af786f627da067d531279da44ec388de6a 100644
GIT binary patch
delta 1229
zcmV;;1Ty>T4ZaEvP)h>@6aWYa2mtDhMOcvzI)BYrNpBlB6u$dc42T{Z&!Wv1Bn3(2
z00v|?sMDf1ftsO5v}cC$kXqazKyvAV6lf1U_105+DGIdcmKgmtc9dKGLOJAc7Hejt
zx(3pdHRM~q_kHB!gFAN@zNgJlNHGbzz}z-~h60;7IB>h*qsI^L?0~zyt&W3^aex^&
zqJJ9q2xu3K8Jo0qeLkOW6W`q?p{vsgvi19q4i0t8Fb$(&)%Al9`g;Q)ecB6(bAI!h
zaI*}<)IT{G9NA;!!#g;j3<fq*UZaU0IC#^9{e9)fjU2n&t>4c$JxG#alKMoMw=vPF
z046^5$bfhx)CE`4>DVK4IPy^9s1`)F$bU^)R@IRMw4ZY3tmh1942CXZhtNlK0&SFY
z$)TBq#72~IK|yaz(>n3DhItwf!5L}*E#P6g;LXo}Ts{B%^>5FYKfZW-@x|rEcgvst
zetYqy@Z+9brI78-P{4$<_&g*IGF5=9i)U9qyok-Y1DP_H@PpNR$N>#aXqdsLCx0D1
zS(ah-G;X{yr6_z1>8VI_&t`ar+4;~|G)FD-L?v5(`zr^0`SN9&5A%cUujWgZOK{Dd
zGs}RhxD*UkK02H7tAZjYfh?N^Xp~Gt8-0k5^UO${#PVt-dUe6hjQWnP3cmdFmp9*k
zB~<~M(zp#N#cqJO!Fx}lI8RIYP=9r<<HH@D&jNCt4{qmAJ%;z=+d3d*@?Z=@XfqUI
z%CODP6g?6oF$}#fVBr*Hfbv`9A)AT569FA?r_46;kk36oh9Q<$E3!!`+E5KyV@{1#
z+6y&NWLIlq?$)sr1j&j2>-YbriQ;;VCPtHmw%NFeCYAhKw=RGzs6+t8aet8j3A1Yi
zAa&b2b(H|GpS@bX`g-}zXNByWDeq{(P!K(Od$LTbcKBXO!Ghh3oqJD2{ZWGjZ2%oE
z4tQTI?K_}tKJDm*UMihln(x{PNR(Z7D^JF!#B^`irQ$5bvLwtG%A)vIvY^08-vIGz
zXkup6&vr`>xq_ZAk#iJ>s((IF(z^t@LYIM_$0Tug)H5hP<bctR=7>IqZU}vmF7rK%
z#8vNJ#{7{71C$txFKMbpMzPe%yPEKkiEuQAlQe?(8fM>%T%6nnpF`S|h2)eUY>+v<
zV(e+(C)2>;vsxEebv~z@^S=iFJI4+icR`K+93$+Gnf$G1{4?MNaDRlnbgMA9C4<*m
zNpP!{1~=>Z;Cfl~+>W53nyu?yeCXh7WUci13XW=)<j8C_k}^yqL(<L~lG4qa7b3f1
zRUvV|tSF@3diRCI{iC7~)nO_MY5orsiMvTvA#uN{D5Ul76v=hI)hddcbwLTcmb~QV
zZhFaU%}fVrf`1Eg&wp{z%Fw(DF*j0Y5b`K<cs}9p9ur+C=Gcm!G`-wTUGuzM4sir*
z1Hf{wECU=*o#jC4g+L1I3JbdlU^$1C0gk7%av+Tj8E)Pd!|{Yt0$9y2<v>~+GTgc~
zhUHvR#&A5flmpq>kYRNhHv*hn7UPMWepV-*-d0D?{FA4*^(zlhO9u$r^s<?F1ONaU
r5&!^DO928D02BZS2nYb`jYU}6^s<?F1ONaU5|fq&P6p5f00000AUsez

delta 1660
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
G0000#<t?fJ

diff --git a/script/bpmn/请假流程（包容网关）-leave4.zip b/script/bpmn/请假流程（包容网关）-leave4.zip
index 41f1296196b39e101537a20cff83e13346efb8f1..9df55d91802cb9878def4b9924429b91f87c328c 100644
GIT binary patch
delta 1467
zcmV;s1w{I|5w;8tP)h>@6aWYa2mnHcMOcvzK!43xOK;mo5Wf3Y5Jb^aV=gJ`SxG@t
z*+l@`4Vnb#O`yrOL|Y<ha;Zm(0tt$=DN>*b5TMuI;!}GFilVXmZ>p#{<u7!(+~q^$
zk}4B4Jy|4YX1{M{_S;!^uP>$(VFq2#w5^^f?*dVPmTnuSHR_3X@9bY|iP!r(T?3w&
zmVb$`ktbje%j=0_gq)5f&FAx7dpg>+-I3%uP?v7pIy{mTAOlcWRO#^Z!QO!w`g9ha
znev<0h?@d{EPZ)+a9bb4sdmk@JfvAVWM0S4)H2L%7aZJVe%Q#+`EG+j!s*j!G1HEH
zf|YkoTk;4n@+buc_QZB2lB>|^WMa>?<9`W^9N7!9THwYki+H2}-HdZ)l;=zokmimc
zI?|@lb2J^MTvBKp*Vduu;ev|&9YN^QXTikFOrSP{swh}EOi%p#*WXtUzI*lCgZ0JZ
zH&>5VKRjIh^2hqmr>loA-duf8ys<y7m5cUf&_W~xc|5WWD6=rDtNW|xkEuC!uz!6t
zvT=L$_c5%Yte!*EY;~pRbr@EP<I*?22i-fGcSe@^L`UY#M9U%YJ>5O4vBlQUUSQaN
zy?hz3XX19AX4i{eb8t1~i8HTdaWNQ-K0NpFhJk?-L6%%a6g=B^b@&B5NoOXk7I~dz
zA{7&MpwT=rBErv~u77^^`kRZ_KYv|_0;_aK*YK7xGz9PBAb7LNAJyWFzy*R<u;KS6
zaEcS`u_d$FYMd{Od$ZDP0ogUC{&{J(@+rx%Wi0dtqx9<j<@)l+^^<Rl_*7v7TqKW<
z7hABIYWC?#MK)mJTTOKw73lJ6_2f~eK$_>7BMZWcROGs5`8FtT<5PfC4}Vr|<8TwC
z+Bn;<iDv!`S7@%`Z|A1~`fl9IocLjTrQ&Bo<n9%=2}<IJS*j49)-cMdZsYz7j=#Ny
z<6^nQzXW`mb<onmB}DtSJJlxfH?jZ0SGayS)GpD~fwuI74@c-@LHW8X<phgVFTsPp
zgO(A?EBQ49XUcIM)_EEi^?z@=Il2-HRhTsDonQ25t0uCR##B-gsuY}-Vr9*1srnMs
zT&uL?VZ(Fcv#nV@KGl%?mSQ3DS}MvMi;s&l@jY_}sXJL?vpad)pPf!++n?!odi!VX
zn4E0N#3snCu+ubfyOW+38SEPznRJz@HB<F%uy@(~LmtA(vJ(uD1AkK+x!RNvNjwh&
z!DgdQ!u-}mvtVRQo<dV0FrxAu4O9{GM1<R8&50wBr(tqLNX1EgzyoN<L#};>l_v@v
zq$QYlJ2!0KGVqYz6O|g?jZ6F&;J<UzK;xcR!(upw=4gz<-%`Rq0q#IMhLiYHZtzwZ
zTvejriV_Ex)pT%)7k@qVg`}Z4Tbt+4&@eZWl{ujba#T|Qp&_?GL<5iDF^^VBk`gC$
zWg?;K6%nDjSU{xSrbLwYM}$gT0TCvG1w>l)|3O8<bE2ps8v{Z?MHKZvCz3jmvn=w5
zh#U$s2(~nlka(BZ8VLz$h}BU>=Y=ZYv)fJ<C+{%KL8>-Gt$&l-vDVcSxvqnE094kO
zi&|SQ0J?GV<p6D}?;Pl!F@l+^XBK4YVwymRqhRa~J~<H)_69vQl#TY>uw%-Zwo4%n
zfNcRdoMm``=@o<zM9l?~W7o_hRt0c4RPg}QI}IO59e}t63IIoTjbdVv^f%s?SU3gp
zh|$YbIbcQIj(?c4sel|}X}b!<=#_>;j9qy6K-%@~S}fMfx9u@HBy$mmmnc4xMs81J
z?V8PhX_xBRDm@lX^}HUVx3_X)Wxc}yZ*8Z(B{6yp;Z=-Y8w-H6x6|ELZZC2Gr(Tm=
zN_Yv%UVQpHT`BQT{{GHCP)i30{}z52WCZ{K8W;coP#H@B0u%rg00;;O078aESpOD&
V7-R(i02&yRUI<hM!UX^T008}^#K`~v

delta 2114
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

diff --git a/script/bpmn/请假流程（并行网关）-leave3.zip b/script/bpmn/请假流程（并行网关）-leave3.zip
index 8f7ffb08f4bb25fe1154273e18add5c03c706732..ab10060bc92368bb3908d322df71e61479bff81b 100644
GIT binary patch
delta 1396
zcmV-)1&jLZ5bz5QP)h>@6aWYa2mtGYMOcvzK!3$p!EW0|5WV{=2%Z~rNs*E)NDi9X
zDFWDT&?G=_!iro`v?-D%DND{NLD4ov3N!%%^xB@{TMt27G<N@{ijq@)p-Xa?<ceI9
zkpcG<lbV@*Z|2Q#C;i)tsV$r#Kd@Y9Aj;c76p*94hUJ(8@zKM(x4Po(-L1ZX#+GA+
z*ncPxu!j>2#7P)>JxQ9+=iBbo+;)9a3OuAsckUk^NeYkw&=gfV{AzFiKummki@;+1
z=B?OG0YH|%IXrlvPtX+JvYa4<j*h6;$eTKb)%3u<d(;mb89Lu>Z!hQcMS7U!W<Jr$
z+m<T@F|hbiiVR%a^`$shiPPA2=Wt}B)PIq_h);{$sAUxo2GG4MXGVR_L?MK}iNYf|
zMS%x(#JDhMJm1w(5a5D}yIX?LC(nX~kFgOvLoHEoaF~Jk{`bF@Pk(s#$J5ot^N&~0
zmVf{G{<oi2|GZp&_vYi(kFhuQ$F=gq{WIi*aftZw$Tg5m!z{0!EMGq-=GeiVg@2}t
z<+Xbk!y3x!DGEE?zLdUB!b(|O@@5tw{~-)c;$uG7L+i{6&xc?Z=>AEHdG+cIhW+o`
zx7m3Xmh-fDUizAYt0UXqyj8?SVNm+$bcP!SMNToY{3)UkxHDfzU!yUbnWS3r>mn1W
zny`nA&e%u^zka#;_0@-OFFyQoA%6<A(mfsGmN8(69^oLkS>?}KSw_$zL{8N3`!<^5
z1PAoUVz%0+3*+%wZMJ~y8`IfoZMMoO$*5~A^fsmR?#boq^5@ly@2mK1!Up)EY>pNU
z*i4~&Jl>EESj?P`I!Oz3d9{4;tWY2r1eWO_v>_E)gU-wa^)fyNp&Fn~Wq+JB0VCt0
zUUOpp5?5#r@o%Tc0L}bN%bfU$yqNff5T(6Bo1i9slBEse(;CwF9`vDYBb#`~N32KU
zm5NT1x>C_zV@p-EqorRj=^94z8aYNbo#VfT;6xc|NaF!c<<A1{OEgqv&WU%qX3|d2
zC7s1oQ&BQ#IEtjIC{v_%4u4v{)3Bn%n42In?FtoLt2}MKx_LwAQnQM3w4NNs$qdzV
zlgw~3pMWgyB^sivm(rTY@%!`w5<etYyIypI+q0nQ!)bhA?s*tZOnTSIncugegHq%8
zDKQlyBQihJ8%>({T!aS`=%LbY>(H>)!W1M%14gxsu9>|%?#wap-G6u>YCCw~oa4E!
z;D6_q5l-;m0RKHfmN~(}x<Jh4I*aK5j*y)j`qDbyrbLo@R}mqKXh1|!Z=6UftaIbU
zv&<q7-s~-*p?0*S9y?k}L(8$y@+>ybc=9!@$~gI6RzPhjL^|CY&v^PY%->TPCd?0b
z3+e@-@1EcrOcf=im49Sk0a^B2IYzA-M%hoL!MjAEN*Y{Ivf#4H2A6ozH`eD^Me=A~
zq0hB1NePLLdK3C2Q@BE(bWT@5?P~v<KABrWkwy8%ri6kFB7ww$%rw(#=LFgQ<aF;F
zCMxWHMU2d5n1hI;V5xZc!ym??Zj+8t){?nqM~4M##~_Y?HGcq{Tu^y{$qv8=qLu<F
zvFnr(+XQfOQ|19CO9dZ@20+$v6@XK_b~Ul|i{HL3vE*vcBSyBFdcca>jF__CuN-2m
z-3G+SQotcbR|Y<i9j%$fvhKdF#>gF?i#S<B_(<BNnkd?JI-h9AXm%5gC3^x-V`Ph{
zCswB&3b?VIdQwedWI^FojI1veKz5qV-EOHCIe?kh@s^S-LB+*qcdIYu{+E4s>pxIS
z2MC5na!eit005g8002-+0Rj{N6aWYa2mtGYMOcPLa!eit005g8lM)D227Cno0002+
CAGA;a

delta 2037
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
T2LJ%7DU+53R0jA500000SDXYk

diff --git a/script/bpmn/请假流程（边界定时任务）-leave7.zip b/script/bpmn/请假流程（边界定时任务）-leave7.zip
deleted file mode 100644
index bd553753af1a443ee96e3faa6949f8f007f878b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2172
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
K+4L-b+kXJqoHOeH