From 714c87c259fc199c564dfdc5336e80d724a640b2 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Mon, 5 Feb 2024 21:37:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4bpmn=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E5=A4=8D=E9=A9=B3=E5=9B=9E=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/TestCustomTaskHandler.java       |   2 +-
 .../service/impl/ActTaskServiceImpl.java      |   2 +-
 script/bpmn/请假流程（子流程）-leave6.zip     | Bin 2182 -> 1587 bytes
 script/bpmn/请假流程（监听）-leave7.zip       | Bin 0 -> 1232 bytes
 script/bpmn/请假流程（监听）-leave8.zip       | Bin 1535 -> 0 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 script/bpmn/请假流程（监听）-leave7.zip
 delete mode 100644 script/bpmn/请假流程（监听）-leave8.zip

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
index 478328391..fb04cd01f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/TestCustomTaskHandler.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@FlowListenerAnnotation(processDefinitionKey = "leave1", taskDefId = "sid-31C52262-04C3-43D8-A3FB-8434017A6572")
+@FlowListenerAnnotation(processDefinitionKey = "leave1", taskDefId = "Activity_14633hx")
 public class TestCustomTaskHandler implements FlowTaskEventHandler {
 
     @Override
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 19c5de554..031d676f3 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
@@ -611,7 +611,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             //判断是否有多个任务
             List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).taskTenantId(TenantHelper.getTenantId()).list();
             //申请人节点
-            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
+            HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
             String backTaskDefinitionKey = historicTaskInstance.getTaskDefinitionKey();
             taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.BACK.getStatus(), StringUtils.isNotBlank(backProcessBo.getMessage()) ? backProcessBo.getMessage() : "退回");
             if (taskList.size() > 1) {
diff --git a/script/bpmn/请假流程（子流程）-leave6.zip b/script/bpmn/请假流程（子流程）-leave6.zip
index ded3cea9216eb9bc229ed475d7cd841b77cdd384..ca53c3bb6707ce3c12a27db7d55a07e21bdd8409 100644
GIT binary patch
delta 1470
zcmV;v1ws0T5wi>qP)h>@6aWYa2mmdqMOcvzJ%8O<OK;mo5Wf3Y5Ii>~m!zJM6eP6+
z7_eQVNrB!3id<8)BvR%>4+jMjG)Nod&>ULyC)AfBhoUGD2k4)v<NDOU&?R@5<chnL
z5xF&5UnG+A_-5wY;f&n5znF}r84N<#_qsCJR%Ho#mT$YB)0Mw?^5|YuzTeyG*znl(
z+<yoOg%Z;6!md1wqG?-E=JWZsKXJDGz)`{}w3LTO2ZxHL0#&VPhH~)P&hEa9b=r&2
zW%TBHs-~$bP`*6ae{2om#JuNvVPtw1q*{aN#IxO-I^5Z#dPvB&#A-V`1*K0jXRe>?
zB%ZfjUkOuS>7|kg_+vj%(p+Js<FP+C2Y+LjDbgFMw?vIfR>i>p+RJlhug{q*MP}f@
z=+K<NaB5nRQDM+b1K)yShzctAwj`-Tt|b?_8AEdh>$2n_GhO-5x4&IJ|K`K5&#%s3
z|MmXc%b(xS@2^r-q>Ks`M7uNSMX7#zdFa~^P#c%;pI!d+nusF>KaLz9ajW+TVSnm_
zNvs~9)jCRc8=F;fyW~zB!r+M+j#4)dtjL|Y(Xy|eEp?}ULY-ZG{|mzW$GdmAKNoR%
zQudeK=HpWJmJVi785e~?!-uCaIxR3!N|6=4$WrLXfdxN@$82VBsnXl!NR&#`1Q=tw
zY=h?j)FQvR926YHgQG&}OM-$FW`C(!mqKU+F&M9=u*{kCTOSz5s$DZOuVs5naH`f%
zIQB|p5z}SSY}%HV(dFXB^$)+x5<MPmGYnnFgXj?`0)dMNdP#rW9m5Io66Vj)(@YzQ
zJs<{pPvrzbavJ5fY}zPK@+ax7JzH*ruR01>D|e|>_*^XrP0VUR%BO8~Vt*K3gO@^<
z*JAo%Ukv@&`tiw4^RBEZ5U8CsVtqslbp7@D^^fP5uijo=e0TNc<$t|WS^n2oY8;Ga
z!_y5aMSKYw1+53aQIHy}E!I?rO*dwX^*^Z;&HwsJ)q#IDus5j`_QkJMRt#>XXaVv{
zLC;?8tg0D7XL=%wgQX#qI)A!C&8-UoTM&dmQ5HgAk!7zWC4VPXzxH*{o0vLf-iK!w
zH=<n?>HY!ARS<5qh0}NCns+K_nWKRjf8<y~yoiWK#shBurun9Y;?NAZi<yN6QPJc@
zp|c^bQcOfJtS#tf6kUm66cfhXp`&klftQMQvODa!rW2Tx)Lr4apMMmW4!Q;Lqp|71
zOgO#5qEaG6N}bKpSw0FD9uLiFZXvzu7Y9Vf4)Xx*9_=s+{1GBHGb<&lPWz!Bdp6q7
zy0T`V-DHVARrEP`?P%DQb@X)zU1u2K?@B?x0B+wLz%kQ}%f>ZqTyJE?H9a>D4A!_J
zvd%n7(@>qQ)k(K+yMHUmD$T+bInp(pBhaX2VF0y|q~@9=75eT+2ZFg<6$oK>MIb<{
z-&rKgK`V#B?+v^d41h@mS~;oodV#TZ`8M)Bs4c@5sK|HL2;FdZF*Q9KBK;_cVHJ9V
z769Z0Xw(V?NYCM>Nya0#Fv*+^Y6WIZRk!uRpH}}jQjUksDu0TTakL6~>+a7gnZ+u(
zgQvBMKvGuRbs%^ms|tk7Y!!jDz#aD-GChip183|l^&GWv>pf@Jc3^2=E@Nc2=>kM#
zWo|B~Xts+|+Uxj)YDr&FD&)xVVC5LZ39$8m$=WCYOqWVAkUAGgS&klq%>m=>Nd%be
zR$?GcE|9VurGNY8fbp&*0!%h3F%Y0~k?;fwyEli7f6o*_Cck!yk!X#ZA*KV_#(>Fh
zl%iutenS-lF}OfDa`oE+j8`)eV6wPX)LOeKDYV;yOja@xDagWBfkfvb;Rw>n@J5iC
z+v#qGSHJSQ*W2nSh5u^xw*CfCO9u#l!0DK01pojG8yo-tP)h*<6aW+e2nYxOEvZFV
Yf57ROX9WNN3mcO!2vG*Y1poj504q|!HUIzs

delta 2081
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
LMFtfJ00000HwXn<

diff --git a/script/bpmn/请假流程（监听）-leave7.zip b/script/bpmn/请假流程（监听）-leave7.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0a71e291d006858249f64390199ee790e8eaa511
GIT binary patch
literal 1232
zcmWIWW@Zs#;Nak3s956~!GHv`fb19Rw?A!cf3~&p`HJrMdpe%ap7?aan)iD;b#qb^
z%Tmqtk_vM3j12TDa&wM`d-gwe5!v^B{RW+Nm*X~lb@A+%m^9JN%UpTc#2v0zzjX&6
zxxGWHP^skz$B{)l8(1D4=;f|;n8obm;q3iK(&_T@pWIVU>*;^Iq$ri?S2*?lr@il2
ze?KK@6Jfn=OH)I_dD&C9Hfni4keb&So2^k_@$tpI&OZ;nWF#Eo**(KZS;>%pI?q$f
zrFHRvhYW1K$-KV7t<(A=L4$w(oVnV&R;|o(&(}_W-+xTl^4rVxoO(Z6b>A&py=qxa
ziCJaVnS+ksH+X9l@e0IE-}iV{#r>AW#}D;O&UD**J7Y?5mA-G=-ZSc_YI<y23leHp
zy0FcA%gXg!t8CWIxDLHs580z^=f!q%o?d3f)gYHXXJ&b^nzsn6*oERJ3?C;lvQB4`
zvj4!N(88%TU(WNALZtVMr5hR7E>QQ@<2Ii1zxL<xZ$HET|M~al*{h?kU$4)v`<3_m
z?fUiW_dl#VGkK-Rg^ye@r{@0rbjR3Hm~q?n`MLF#6K5E+=X>h*%dWZX&T}E;_L(oP
z7bG=amdS*je57XW&2*4eiF@9&*ycx~%Vw{<<vN!y)OFMB_w~sQ|LeYLoo>JBSa#~?
zrMFTs3m4n|mY811DY2-gVq3~urisGt)6Oe-ABkpTt6|uzWW3R@W_L{IrHBp7?%$sf
zYOVX@ynbH&5ASI$yJ}rHw#6i@-_pYz5nQnNncVFM240;Nhwm+&w}CBL()2rva2j7@
zN)xZxB7?Z!jMlO>7JEK(vO1|>l$3mLRdec?+meW&oG7m&(Yh_MjVvF_Ia4mPDt&fl
z?b<BDqNN?E8homLvyWD${+39MlwE)Sy!v*0_3iol@9f)Cr<@cxtuTJBUeUIhE<LgL
z*|^$Qs@&M`y>#8RScTsKQy=ME)mrKlVm5g}{0f$JGkG=tnS@4bC*QMMIah?KYNN}s
zK%rHVRc~U853uZ#`J%K;;=99{%zYjC2kJ^L_8M$rdh(%U=T{Rexg>+<XXf8H(RyXZ
z`lMh@Bd;ZX?DePI^$uOO{Ir>)#`G-z7N<FfxXS{+aq{kAwSH3cPUUm;&i@ypcd7lJ
zA#ti|w&|U=zpLJuA5ojj|5U7c4)eBWCUs#&|11lHOE}BEtuopn$DaT7(t|2(?sZ$c
z4^G|nqSbs(TiUj=^ix-kSf@-~=Ev-=Yx~UOb?GG|6I1s~CuLQhM*ltFG-+G5hKos>
zv*O!(xAj#r52?9MGRxIi^81^JCQnb1=vCu&i(2CJ-|@b!yC%IhZ{5dTpZ>F2n(1oP
z@=R3}vzuDP5jjO5x27yM;NG5-i5Iu}O*}1YeNonRH`61I8*&Yg`<tx}oLuf~JE2T<
z0@v<Shxiy}?oTdlm>j)D&LiEwZFhdp!yjd9nCIM?`_-YU+DPZzx3~uG+kYnYynpa%
z@9BSB+B^RrTJHXzF~FOhV~tnY5-t`721kAdh5&CyCJ_ci8G|ebDq~Oq@g+`xH!B-R
PFC!3w3a%ueeGCi$m6bI2

literal 0
HcmV?d00001

diff --git a/script/bpmn/请假流程（监听）-leave8.zip b/script/bpmn/请假流程（监听）-leave8.zip
deleted file mode 100644
index 4c655036e6429cd7df284b01ac88fb038fdd6f7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1535
zcma)+Yd8}M7{|AWsW5lpq;kU4TnaHH=1>+%2SdswF}F}Ib4}!$OD?%J#9VUEZI(+e
z*+NZji!BzJEzz2`WWuRWr}ORn-Vg8pdH&D)yx)E{2tIyE00;yEB-Y<|0Q`p9&&+JX
z(c_Yq+v6BDX{_#KM)3oBRz0gb1?uPN7V4>|?jGnLa8gq}+~02wX_ZDbm+fUZ)Rez<
zM4VDWUGJ9X2<`7G&hkT8f=r&ObR<LZ+1>Lt!64{%S-!MW1hb)9VV{1k?K!^fQ&y8k
zbPdiQjxC;%YZ$*)o0S}FAp?V+XP~|2=SbYiaU1;w$3xY_jkPTA+JT$^N?OiNBd<Rw
zxga8%<y1{nB%Hs}hrI$c%VyQam&@Xu8$RBCmXpCVK#_0KJ?8!Kr$sZJkdr#E``SXn
z2Sr7u4pv1M5fPmbh#PW}L&gloQ|Ew+f2mrpAGLfI6}RGYzgERqp=y%ZpEV}NO%ng=
zYG}DqxQLe-UH`J-t8if@<n&<FbKrVW8PpdV=UTbQE>JW(A1ltq9|((qk;2ur-z84?
zQv>Gk2c`IsM@D$vda34yiWYP9j|hmo7fQx79ysDTQU89nQO^EyuDnNyDsJ*TnLgr1
z`2a70E=MD`M&7x-ukZ0qop`bc(MpCbjSG3zX7}laPCqZ*{kHN^CU%?0;kGu>x__*5
zGiklNWyWcZ=eBuzqSojz+gAzD79kA}6YW4tdwvx|$jBY^J9x>Eg8O&%iJIl3ayI+5
z(gczzC5Oa)WRHwb_gMP^8{DmeOa8FftU&)sBNo-6l}~E2!CWDD#z(R16073zo%~6i
z^FKbZV&b-UHy7`LTr6r&4;z=9y%hAI4IQ}bG&Sz8c-P=ed87Pcfk=3j;>lOd4aISd
zYUsjQ=N}8sfpu+|c&vAFf_4WUattV}of!d~Fe>kFd1apAB`!(PJ<{=6Q0^*rX=9Ak
zy9>ATF=$r`^fq45<m{+yS!@xvNbGdyi)s)zofxMtX0pn%>tf98w@RA2q5}vOP&HBi
z0;6!?UShM+<LX+_{%;j`1;1v4N2LrkL=vcX?Y>KxMBm~Nq|Hx7;wl2fO8Xp>7w18F
z)$V^|9qpLY*sqzTK4AMORwKiJNOD=AM{c+ZQsc)iPf@az^vB{jF#rO*C<VTd0G@^2
z%DSgR6gFLiJ?>i8$EzXPk8&?wH<A(PB^e5@z;R$t@EdYH_?+wv5hlsc^%=uN^Hx`r
zyu6H~cUCq>!`8a@=(hVj3xLUqqWd*Cb3uIFe)t<RyLr?-lQ`MX6Ou3yzB$vxD-thS
zYlfm$!PMZHBI=SzfgNsGZz&4L#^R!)^$K{f4oFL(h|WMgKwrJ`C8x&xU<KGn@~O{z
z@_~eh3@w6LgR9;L;lmz#&kPiN*JTf8ZBilxu&ce<z*(238)cViEc$5uF`qONF|#5@
zI^9w&ePe4n&*f<VAV8!d;rJq)o;Sq3N>r^rVS&sDiUg-SxWA-DaMe7sw$?Fy<x3-^
z#<i*(Z2ob+LmPt4!19!maJh|ClkMPr=`B_-COyIjkZrmcdx@T!GP}^5CeEMVyHrEN
zXxGjb>!9FXPHcj5T{x92HU7{5NJfpi=;v2hg#^>vDo1t{D7IcSy0<(buMQd#h=DtQ
z?(4dvdqbGgD&y*pN~0+6J`8>HsnmgDn~r?#^rBNkv^Y$<HErl(S7vyq;M56EqcDzA
z^Y?Y;YRqhce+GFb?>cb}#R-2z2y8dCPC>2BOf|+9>5OWiW_*A%a;QtGGG+N3F-UH{
z#pn5}ITj+JQtQmy#fEey8CyiiHe9ZpMop3Oo+xePe=ULqH(RYR3A!Qn=CmNTtGAYA
zh^%LaKT^4;?M&L%*1kH6TGq9uLy(zRcHpVoZ-||3%89DIo0-Fyba{>=@5(o7t9oot
zE3J!+(%Gr&+7Put2!e6}_%Qvw0Kh(J0Kf(T+#?D2SINJ3zm)u6{=cAY5PJoF-2#6O
M^5=f=^B(~44@aE$iU0rr