From 7aff8036effbdb2c32f22bf7a69f047e0e7ad0b8 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 7 Sep 2016 18:57:58 +0800 Subject: [PATCH] fix bugs --- OpenAuth.App/ApplyTransitionHistoryApp.cs | 2 +- OpenAuth.App/CommonApplyApp.cs | 5 +++-- .../Controllers/CommonAppliesController.cs | 4 ++-- OpenAuth.Mvc/Views/CommonApplies/Index.cshtml | 2 +- Workflow初始化脚本.sql | Bin 29254 -> 31112 bytes 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenAuth.App/ApplyTransitionHistoryApp.cs b/OpenAuth.App/ApplyTransitionHistoryApp.cs index 80bf4976..0136bd76 100644 --- a/OpenAuth.App/ApplyTransitionHistoryApp.cs +++ b/OpenAuth.App/ApplyTransitionHistoryApp.cs @@ -26,7 +26,7 @@ namespace OpenAuth.App public void Update(ApplyTransitionHistory historyItem) { - _repository.Update(historyItem); + _repository.Update(u =>u.Id, historyItem); } public void DeleteByProcess(Guid processId) diff --git a/OpenAuth.App/CommonApplyApp.cs b/OpenAuth.App/CommonApplyApp.cs index d72ea88b..c28077f0 100644 --- a/OpenAuth.App/CommonApplyApp.cs +++ b/OpenAuth.App/CommonApplyApp.cs @@ -22,8 +22,8 @@ namespace OpenAuth.App { if (model.Id == Guid.Empty) { - var obj = model.CopyTo(); - _repository.Add(obj); + model.ApplyTime = DateTime.Now; + _repository.Add(model); } else { @@ -31,6 +31,7 @@ namespace OpenAuth.App { UserId = model.UserId, Name = model.Name, + Comment = model.Comment }); } diff --git a/OpenAuth.Mvc/Controllers/CommonAppliesController.cs b/OpenAuth.Mvc/Controllers/CommonAppliesController.cs index 711a146d..ad4ad7f5 100644 --- a/OpenAuth.Mvc/Controllers/CommonAppliesController.cs +++ b/OpenAuth.Mvc/Controllers/CommonAppliesController.cs @@ -145,8 +145,8 @@ namespace OpenAuth.Mvc.Controllers /// /// 流程实例ID /// 命令名称 - /// 申请实体 - private void ExecuteCommand(Guid id, string commandName, CommonApply goodsApply) + /// 申请实体 + private void ExecuteCommand(Guid id, string commandName, CommonApply apply) { var currentUser =AuthUtil.GetCurrentUser().User.Id.ToString(); diff --git a/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml b/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml index 1c8128bd..b04ed607 100644 --- a/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml +++ b/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml @@ -32,7 +32,7 @@ - + diff --git a/Workflow初始化脚本.sql b/Workflow初始化脚本.sql index 82d77e07fc12412fd96f92ef6309a58af3cf58ee..78359cfbe8486ac4757dbaab8a4be0a6a99132ab 100644 GIT binary patch literal 31112 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 G&*lHr-JRF~ literal 29254 zcmeHQTW=f36`npSK!N@QA}^AQ$d;(93%M{YN;VVg5|N562!=peQo=-*5>j@o76J0! zAJN~^m;R-`wf(+18qQ^JTym-Ff*`rvnK^Uj%$YOiw!{DZcULvlnyRRM^+uhmuKG!x zs8d}1svfINb*wJbJM~BPg?g#B^!F3>XXjPH-9z;w>b*zJzW`1}wNxATPH~S=k8phs z7>{FmXrk2*sP_Tyce*Xx^KMsl)X#ueQFTDOKsjO0sHf@)KIidS#rLdQ#NDczL+PAa z!e>=2;Es#o6OA>;*g{DSV`{2~I>7g?dW}~Tcen7%9iyrJE$VEc-5RhsK&v{gHu1Zm z*706bJ27onad!>3K(kd)@92s?`|3=60zJB#Zv1|yru3K> z)g$z_sj=m^jP0vFl#tT#kUjwR=M+d4U_)9pF|Hkqtf8sFS>9IPfI=Y$g}rX0RYPr{ z<&N3|zTbc@{9Xlx$cLmEsaMB6&PO~IYN)xY%O9b~23oyB{VCv3yPBs>JyUOSx1yfm zy@mN&S6|_ZeQ<6X`l!&PC8y2&o3R7nl*3BX%+8M-G0r zjX&a~`F^W$o`=-uSoid=S;&0(?Q(-ac%nke`TeX!%6-cI;rGeC%fo+v8>OsU5>MGU z+TDKI&S7`GF6xqJ|8)4zohWtPlHsUpIjaJ$Ctu$@-!Aq!bu`YUMDh7Llo~5~T~iKH zUQ()@>+6vFNu{uszXJSzF0qfz;vKzP)g_$C7W$%OaaYJX`k`zNWzs6-OdB{7%M-jQ z)mf*GYsz9uM#8M2p6H{Lq-VG6VntJ=CEtNoaZ7OZ_9X zHvRN+!?67Klg91@Sf2tb*=aWL-NoK>jGeNBk~rDww;*+Ts44pOHm*pkGhk??zu?Vr zpQA6*)P>>mfyheo0{2#8(gplzow$0OZ

O^EqdsG&T}ByPuUS3j0(~!Y4XIAx@{T zW7@#7r#T`CuPB^28pLTKFEsUu?HQ;?TF=1JnS))j5ZfcyFR2i&Jb#4oYdC9laverj z=UilUx)Ro1o$jhFS7!y5!2MaBIN^+*_!S{C+hjQWiS1EVaSuHWl z9_s4vc~>dt^poaZv(uEjsJrjp-d%K%b;{XIvN*X$@9#Q|?zYoW#Nc}$Ibca`3C#1dIg{D)KAC;cfyXZ&F zPcQ3bY`}6L{r2I%pts}~?H}pjuISj-QemxRZ>x_(QBc?5o26YOdUhAKt;OpCGjIEe z^Afwh-OxKMS|jrr!cznRo}I zBVx_c!Zdf2`6_Pp$7$-L(N=6$ z@+p2zLn0rd7JWF2_+}~FJ#`{gM`*i*H{%bC8cn0-Q^1M6++WI~}hl`%xSlB{N={q&utF7a8T80{qW-%c}+qm+;~*>cm2eb;xnnwo!Jo zJ3Z=0m8T~f)4kJy&=M3BzUDwj(uIRM+cJm}{ zka;Sf!Jn?AmAHq=9x;3^no&Njs{zmMnYOMZOJyJOAzcd^RnxHZSb>e{M)>pOOq3dh zXcAfZ5Lx9WUt)Y#y&ESlWty7<;!~!0spi9{<?!rnKO{1*yv>6^RqeIdEmITpA#6kT#Ax!Hnvv8@Ep@x1=my0!dlAd`Yh3+VO*|euE`5@v_!)lD)bB*}^EsG9+jlwj?dd_qcPS zt;<7gi%vt*nk!nOv{adMaDwkc{W;sWF3ZfyFh@!vWWM|^Gb^tv_s@7RzQnF#y*$jF zaZ9+G8(O>KuE^*uYm}LlS$V5&c8^b8w`4f#QZMl{hRe)K6Aw0?sNr(A%FIgc=6SL^ z$-$D@TV_^DPNDUQhde3!olv;Utc*r9XeqnTgSby+Fz>m{tSncjU0r^TF)34KR*Hn7 z^_TpVmedhhb$$8IWoD&BLi}8P^Nhs9*+mCgr)6fP_#bI$-L}k1dR7<_|GWCl@oaSA z>HZu1rmx@~t0QB-h37r?@UA0w?;Q6oA(6JBC!Xr3GoCpuo3JXQ&!L*ww(-!iPxpEf zI_gJ2JMBY~(s9SUX$ki*PRdO_A8RbTkGM@dz`r--u>aTPDk_gr_-$T{ol=J_I+=D)*MH@`z~LLU)yqPlJC0M%&2NV z)2ND7atIGMW3J*8pT`~MWif|q3D<30EyGfy=bZUiOYoXA5;})hTYJyxS08_den{tS z;LKQXN6T;KkyCz`GTV*v4@$G*rFXbSipu|I^vBHwF#ZLR^TTGne+QVS+5>CgWalar zyE7zna~U7LoAKfCWi^GXx|DfoGLI)YncS7Uc`8XcImSvj?)x{5+=%84xj8<@;xYJy zk!Vh(Or^muxpFTy^@Xc|GtmnQFIG^k1Io8CM6TqWP|gSI$3&@kh(5m%8nNdEy(`7nA;R&HLg z+5?|)C(o6-!cFQ5lf zadJs|%W4zKnD|!Vn36CG>kW=qe9I*4(q)>AAx%C>jnQPx_4osy%_!&wEC2|Vrf^Mm(qxRfYfuOF8-!KVQDv;v=Qa?caE zKEJd}w^C2IJ$~mRy#z1e!#anYpf4->)C~2*haAnyqE7MB#AF5xW(_9UB36Twr>N3B z3`tO;9?tx5^4cs}6ffn_U6Mn)u!$LQu}`AV+HFDF$eEdj+sUQwdF-?@dNK9JE04m{ z;`bmCqi4mZ;U>@T+jHiJmk*+C(mIrE24f>;%YJ&>mE!6k`+b!CE##-&a$HSgXh3AV`UfD(fQ6tA@R~qsOS1TlAhi@lQ?EV_s4Vc z`Rv$hc;0{`Ve{`ElC)#HpA4m}7J zRh7&eQ;3l45=C2w4he%!5yjclbN>}b# z_Wy4Dxh8eYY(9rf;ml{*!BU^HRIaStG?46_kSk0LUy_b45#Q+CNZDm9|H_EQ)2Akfgw9%y|An9Gr zD0@9y+y~{?=%{S(H_N%bOf8?W3+nn8Se2Bn<}?*ohCI}LswnCS|EKLr{2!}2w0hCr zqyGdK%F6Uybo1|Nqru_-#f4n(40~`DZ&!|wr