From a39ae9829c94fed248a4ba210067c2bf6f2c740a Mon Sep 17 00:00:00 2001 From: yaoyn Date: Mon, 10 Feb 2025 15:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=A1=86=E6=9E=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/nacos_config_export_20240202135701.zip | Bin 0 -> 9556 bytes .../common/core/constant/GlobalConstant.java | 10 ++ .../mybatis/MybatisplusAutoConfiguration.java | 3 +- .../com/xjrsoft/tenant/entity/Department.java | 95 ------------------ .../java/com/xjrsoft/tenant/entity/Post.java | 38 ------- .../com/xjrsoft/tenant/entity/Tenant.java | 40 -------- .../java/com/xjrsoft/tenant/entity/User.java | 91 ----------------- .../tenant/mapper/CommonTenantMapper.java | 18 ---- .../com/xjrsoft/tenant/util/SecureUtil.java | 2 +- .../xjrsoft-service-organization-api/pom.xml | 20 ++-- .../fallback/UserClientFallBack.java | 6 ++ .../UserRoleRelationClientFallBack.java | 5 + .../system/fallback/MenuClientFallBack.java | 10 ++ 13 files changed, 44 insertions(+), 294 deletions(-) create mode 100644 script/nacos_config_export_20240202135701.zip delete mode 100644 xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java delete mode 100644 xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java delete mode 100644 xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java delete mode 100644 xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java delete mode 100644 xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java diff --git a/script/nacos_config_export_20240202135701.zip b/script/nacos_config_export_20240202135701.zip new file mode 100644 index 0000000000000000000000000000000000000000..e0e56da36fff3f4b8b072fb5d71b71874240c887 GIT binary patch literal 9556 zcma)iWl$a4w)Mu{gS)%CyW0-#uEE{ecyM=j4^D6kZW|2*Cj{5v7RXCpeN`v-oO@n< zv#YE6Pmfw_^;m1pF?s?Op`hOY;Njr`WKI$~fIouz*RzzgjJT$fhOw-gswR-t!N<(h z-PVoS+1|sA+1$y|%GR32$HCrGeL!VR487-oQEMC`va`IWleSbNO%ofP{20UGRGH1t zPyM1ZMBi7AP(f0S+960m41)}s0^(L|5&DT!ca;AYx6>0j*!6Ptd2@=eFH2s>PIpKd zCq_kwj78lXpi>F#N2SupSYEVZm_;zF4SH}@%OfdT7~geQ(`}91rIoU40~y{g&2+!J zb-IY*TR-wrL6QT-TzSv(;p5~K`|hRnJr5_-fl@E7_}6X6fW2D%oI_H`&5szy(Qg%X z4PEf2U51Mz6xr015kGc}FI&jv&oWT}D?GtdaC;Mw-A=ehWz>PoaH0amH+DMJ$aVVU z78ayz)NNZwsDvK|EVWM^0cT#NLwe5UUQn7DhQ^Y>Ws|6^wmk`b82whEq%%jtNwAKDFhi*iQ++zgkg{0MqjK%b#l8;M7BjbtP8v~_cu{nB-9 zWf5}{CQQ;nsgGp1){nYS6-r(Kl*LImntZJc5@d;&?woBwl!93tXO!dd#b>nQlZ+m^ zD$mo#nsFQD6yugj?@^}1Wou&4=MtiNhBI(EqgMu(uU?Mh{ z`#kW**Y)rMXo^vnR$b|aeAj-`%XXb?`D5?Be7*a+%jby*t^P#_w^jLZ2V~>zCmZ-& zxK(xIC%AL{`pqOOze9HniqhoEm&V#Qm(w)W;k)q@liOG>St5N`QrMnOzO7DHLMGPG zqN;DsRa6t!#adCBL2%tkn24ULYCj=>ig55M4&-JPkN^NOGynknSLT!cgZb9>PG+X| ze{jA`??`)1?&D9e@msh8{vIU@Dpv0--iuuK`Hfj(fvK?ko2f}bB3*{HPfb)U05Gi_ zBsnp>g#Z;*B03FuQ5P0jO56zgYlcs{J?I$pbwf@5WB1JshX_P%wSHTmS5;T4nN4Tu z?z}L(rN(C}5XR1Map`P5JVH|#_5w&^Y<`bxBBwn4{3Jy)IODq7w7i6A@~(r6oNELL zMp83Z(COIAh#w8@Y>?XTE02;dR%!-4HoMzfO=p4t0j{g(QbD>a8mp#iqupsPhJp9^ z1ZGkgD9EKT!!4$Oq~Kcwe7~URbbAGYdfxBYkMuN*H;Kf4W^!1 z!-xe*jhQm#j;45wD)1!W?m86?Z-xGB`YJ?9OMGd|t8R)39k|-`d4sUTksKcY>uyfa zHU!rcUODQgJq6n##(laXLXU%n%>~Muj$CUPd{vVy7Oh(Yo$Z(ghyoc3unzwl*SY|6 z)^nedv5sa-(k=1ICQ-v2kXBEtA%A;tZrq3CCyxSX{^k579^6=$4(oSHyo89m%wnuw+#nPVAC&0GFax7CDD8%I^9QY0y{hrGXZ;ok_;Lr}DFYC!!BAqdMhn=-$3@)o zv-$I3Do1>?Wyz9j+RosB$~If~I3H>4nY^d;|@)X zxuHP#xhe3#=j_<)Zh6f;t)4oo1WyLp zlb|?Ebp()*L7`35LHp3%dhLtvfUYt0z-(Xn1sZC_`Q{`uvo^473m^m4HG={Po@&VlHJ;pSz`@G>ikdqKvM(GO!XX`ftB1e9S zz0a#)^G;g_x2~s$pmUwB%O#^uVLoJ7NZLA*jTT(qadG`sk2*uzYr%{DLhvU|zFQV- zJRj%wrapKh1Lm!;If${Fv@0fV0^$BUFqE%S)h)wl4tT0ABhq&*w+c5n3F!3Q|Fh?o z04vLiXm^!xfEnvXDR}Foi)%;(TTRdmRAW|&+ka%wzvHJERQL3Q;D^-!gZNoLSR=rl zIx;H+ZSKoXbaUV~3?wf!S9sSoEWDW1!Gzk`c&r!89q!p)I1ia}2U!tEDYRUP2%V2N zU8!pXY0Hz`HU*R@v-X)ce(&t*#d@zEeINP2(Y)vFoRWt_>z(IvpjR0=2ZczZ2+Hi~ z25En}`)Wt;UafJ>S^8N=7x-oJwrf&cwG1w!I%K}h?7cgjG&%iysa|MynkP;gMA&q| z@x)~Sj=Y|Toq$<4Gd%8_tNqj+*2<>F8`#^ zYxlt{kl#QI*;H6~37ynkzHwbDsU|5{th<<@BujCDZZcs3SIR(x5Q$luBD%4jIm8Ws z4GdNB>05jqzae=iKP!@Nm2N?Y8?miQSz?jd4iE6+iQ47WruVu1&O=sq%S=6^phMHu zp<0qGSNJ%U)B{jqw-)XDcG~TUyGQ+Y2+>>zzdRBK*__S&*vB#NV7c7!e2trXL%x>FCi~9O9w3= zhG!B1y_2(aPFX&h?~NKiUnPsNefPE1c=w(#6RUAt(e;Fh2eG``!-LkTnow*R#zWDO z^CO}#1y)FRMNIrdj>5hO#Gs{1a)H=tJKj7(RlEB9hu{P? zyKd8xMWC_1S}aFu6(R5uTl|ucZDLCQd)R# zQ#ZGm1ZQkw(O^V|UQS_JCyH-1Xu!3HeH3CJmD%XdkIweo^dk%!7HN<*(i@nq+1F=R z-{VGN}G0whmM`36VNbZ6Hu{cbyz&XXT+2J+ zQbmPmTt`dL*I|36qOM6kc62KW{7FijoNz+r&aR#J>^Jw68pkt6m#z2E zw|>5(ytfTl()Kdyr-w~?%`s|dSB7Qx)Lsfa+XM?>R!C<^S9gtsYinu8ur!ZEpiB2_ zpX68`JeC~qqnhq&Rf+)%@*7F}DtlI4GxT7W7KWtPGtF69Vaserx400Z%mT-u*PfDM zc&JJ_S9I!#YUeCl&;XuNY^t-vX~(zLM%P~EB)$+{!tF0u2UkozO0{)olK2i67hjA) zYmyTde59oi{hj5C5!ynM9L`StG_<-}{q!Q()2{NM{aiokbeYR3V^tIssXif2A?Me{ z!Ut?W&(a&(+my@NkiECk%tt8L_xG>n8 z4N_^_9#Q33tOZ0vk~mP@DVG82>y}p<9E>CLT?(&QxpGu$ zKeHA^j*aPSaS0Y)g-NITU*qJ*a%2(%iy9rh$)-yTs0d>2d7}vAao^C4FBy3Arev+P+!jB#iVU%GnhfO*_Q?_|~M! zJp9zeR){}~^qC?Z9c;a`zbJP@$*=yf+g#6A(u8&Pf2D5$G+zOMaX$Gy2v_-O@1AHYrn;oayCr?TMF??yUrc|`%lnHT_uGIKfRY?_Nr9_z& z_9NI&7FCLo>kCp#9jlPvrKhE`?eW8ID@TzV=&R+UrIGb0yZdt*e~?V|laHv=B(oEp z`QxDsJeH-vre!-(lIu%<(U~886bVQQFHH5qXY|J8)yXB(tWA`SDC?-eCAfJ-i?ou6 zR7(uyv*e&it%)XMXCn0AzCQX6k9BK`J}j{j;?Yn*L2YS*y(>VH zFA0O05qq{4^neAvGtL+%Q;541dcq;~7rMRZZ}E~sp;{T48lid6ZD-tc_BcH=C;ZNt zu(4?C9@QbjJ(r0kmRZ4^Wb~PM1Ax5nndkR!(-qNm<=Y~nqAcWM>X>HzDR%H?-@k+J zl#*I!D+#IadH0rECNvS_y!{-hC`>~ujOtvlRBcXpBdnx+Fqt|a)nqyn7#a@DfMuWsaSUEgnzRZ^96r-?o+ z?;gZJiyzf=Nk=GOP7(BR&h~S~#b@i@OFJY`8c2A*{8dBZa0YQjL(8H=hXG3&feA;K zC}AX-Y4p}QG>*{qBX8dGC}zMJGEHJrnI|&QD7E?9`64D}ZBkMVq0yy{>J1490wLa7! zk%X=2_^UH1xJ!(9PRB0(nX9I`z3FzZV3kR(W15>EiBB29mB&298%rNl*AfaOvb6dH z;o>quIO_t#qW$(%6AcIvd+3wp8z3OQM9LwsS^;a!-NB1?sX5TL`p)~zLe*aPUdzv1{w=#hdB0Q{u< zzx)l7fA|}&mKMK!y}vBIw8S|DNbxrj7Xi`1b!mp$%=ZrEo>d6TX?e_DT$Qsq(Q-=? zN&~a-3sN|`%*IyMRtFQ>HlEAU#qc2=dE41Y%=BSg*>jSR{P5{1t=;Cj&GgKSfSxffNbGgl=`>o+3M|IxCB$MQ+O>YYMoW*y z*xk1;9iv9ww@nxrJRI)VREvpJYx=z>+PL0fTL@rrm)Sa zivYauOekpf?hH+n5^gneTU{-NlrID24k}@FKO4>N2Tksz-c1(rS_CAh__b_oqqUWu z(*#C2V^d&oGrt#yc#zI+!zo=hErESR{^n+V=Y&?8R(vQ*^y4v7*l0*(CuBWq#8{so zjn|#zhq$U^?_3q@@8!==iaX|n001Cc7Yv6=DU8!ZQcjRh+e?99ifc6a{EFz;JzRol=OHr^Wj8UVXCMe<+L( z0ymU6d(}!J6y5WYb2aT|$oTMcokMQ=_^xu-{kq?b@O|xhVLOxX5WVzuhH~3lciChz z29bFidS~bZts(D*FJav5EhJ-~8~FZ<3S+Q~f~J(kn?fQwTUVK=qM7CqWSZmprXsVm zPUM>1l{V!X3UP{v z^(WZHRICVr3Ie40!h$#ZA58Q*1En%>d&*%j`Lw`-!o_8rzOV7=fnEj1v*$bn2+=9E zkUcOQK`+0YMlTF0(s5g1_-1Pdmq|o!t*K^LLn0__O+y6}<|JyVxgarMqIzK(?1wXf zkIaRGOobGOD+k^?j@)FsI-~ycrg}^TP-VU_uSos{rZq#G8h%s-tw-U)VW)G8))tU8 z`}E65muS)UeVh%Uj!dNxQWnfnob$UIlWW2&aMJ+2W3q1 zqqDK5QzIjzUp*ig>65ff2fj8!gNMo`ioWw1#1D!wFzwJ-?3N_W5hmtNqi3uYte>N) z36+*X6{0vgp9sE=eATpOc8)NF7S=6M5TqWR7>q5W;3X ziZm-t4aZXm5dC=ub+wRtXHN5K`R z>aOP1MSN_UyunaJ|0e|eG_Nh~J&521S~%|6b2|{7$R@6+6bb-fg#EvEKEXeBzLlk|wax$A?~01kN;Azndul+S3KTnbzKYII|B2|G#qQ*( z?nR<-YxO136I%_SH-Gc}W8EI&%v!ln&PSY5qH@SuZECD`}G)y z4>RRXevOV>*F7gr5EI3iC9suaybFyhe@+=@i(Im@b=~EiJ=-j-OP*$Jfx+OZS1X}F zEje0%GM+Z-rF1PZLoq?kXtE6r#d}-$&tWBi+=wORRyO{sAe$Wy_Kr0^nUZlaAU8f^ zVoG@0gu`KCLYy{rl!p44$RL&qidT8AcquU^Onc}$B!79Avvyndw&vs{|J#sDmi(?% zES?~_vl7+(boSjh=okf(+)QiAI8o(s*pVTK22tX+^)l@QVcIeS?+Ggym&%9;J|~4h zoHWTZn!c-hpLvx&VZIb~|vKx4oDp&UUV72?9Z;!IX8?XITG*dL6# z@zG$mFC`26Ba+b(vm#3ZyuOc^UzkOY<*0u&6IT#HR0nt~U8WYQk+@?m%rxoE1qNmA z*=o+=%5(058U_zF9d#*g6#U4%U@Re_M52xhQ?($+e&N$aOQiRtk^M%{jcY=jARO9- z$GM@O$GzT{>Tg$82VkRvulIRt39B;~q(-3GmANzye{ z68E~^!_$|z26lDT*pM#E3}dos8sF{mC0|-nQEfLp3eUtCq8+(P&N558PZM_V(qvS5Aa2Nsr?Q(@o?Q2(t_YbaBXj5ox_kn6D|SA@FmkG zLpWFUq!MgPDERIXHoD)W&6%cFP-T8dF+nUh!%3GWvb~T}sZ!QpF|niP4RXwH#5m;z z4h5Y)imZ7Fd4#iKMUmHM*P)MP!axPq4yBr{lnYYN&FGSOB#!QmM?TF7De%1B_pHz+jnxgxmr2;dRo=REEjbEGn-6JCCZdage3CP55+t@ zI{MJ*V%oUhebW`vE4bo1FcYi_pQnSG9K)jcULK?0K$$BL5BU{#jIn@h1{z^z*UjnH zU{M=UsU_HDEPOR&>Wt1DSI40kpAL!SeUgGbwF6DF^hcAZmQ=4Mre%|z%F($4C?{QlM+ELIUtmJ(>2$WXsVX-6dcy|h0#d#=U3;SM$hA% z<`8}o&*Pe>Xz%+#5e^V#!3j;FgvMb=pu>a%a zfcE{G>YV^D3GIhzKD4^1THJ@DoU-m>In(IbgnV~@O>q;|Whw>JK@=k7HhWzsWq*Rg zCyL};*&XkZ?^CEXEB&?l&pfRssIX?j-V}*)*(EpY+i@Hj?KKDs) zf*>~xXfHl5gV=cYK{wWM-e?eKo*wr6_Q0?HbwgE^^x>|T0pr_-3O>)mL%P@5r(6vV zCGRYAcl!Xdye^!bc@!_o?^RtE7*^2j9>fba3#J@*8{a~EUck*x_91=#FV{|)ZJ}#k z91D%R`Hc-GXJ2JyZ39=Cr@>iELc-0?KOPqCuZXWiJfA;DzD?nDW8O+>V7@FFR@p_b zwW&QoN9t9???FLsQzUn%IksAPc9&#$yKt>ucBEdx5iq7i8Jn2TiLug1aat~{D_rzW z@y+;kwu2k~r#1&VajKb@$o^QCsRVB519lGtE?NUlgz4=EZZiFz4ziT%O}*>IJ_G^K zic$nEGJfw#ZnCSa?*TQiR)`aRP0JcqYHg;o)WY-defB`Pzq@yvDhW(Y%03^Wb@P(l z_=bvaZR&#dm7xzh`TI(3O03;az@*~mCLgPcs8bWIGIayQHSz}sYA*Uy{v28N6*Btl z1uKppd=Yr3aQ#u_{iVjtR^Ow`B8&YH;75r+@qfQr<9OsanQq`Kk(b#Lx~QPWpqX8? zPs~14=rZrv!&<;=+-{;4w2J4XWQpHVrUz~Y>7X2D_*Gl_-|rvnAH2f-PIk06Zf|ma z-9JUt|0cUXYIouIX~a)#=wTP(y@S1C(V9t_IomVRz@dCg-X$U-+UrP%hnlA%*jQkY;GXNGor^M>OpMzQt{GIQJw@-)*8@(psF z5*a4UqqG=;I;R^Yd|wM+D;+C4?`H*ac4}Tuv}(G>_I9B@IvD8&rsm30E_PX5Gj~Tz zfBeX@-y?*B|Kd8@XZ~wEVZUymA_U|cz+a6lfBxwI-N^Ev@&DD<@^{ETwe{}~fxqJE zm)!eL$ba+;{2lC1rTCjkf5j@+-@*Pa&i{_}XYKi0TmBWg*nh|RccuAv)IUqU-*xL> zp^pD|)IY1(zvKM5n|>FFe+9=c*#BI%|6VTs9q~`5{^#0}{-Wo9LHvW7f5-ZhL%+HG hS71~89qYd^9jFNN>!1Jt;D23SzgRH(>m>l-e*i_f4Ltw= literal 0 HcmV?d00001 diff --git a/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java b/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java index 082c89f..c92f6ca 100644 --- a/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java +++ b/xjrsoft-common/xjrsoft-common-core/src/main/java/com/xjrsoft/common/core/constant/GlobalConstant.java @@ -737,6 +737,16 @@ public interface GlobalConstant { */ String DingtalkAccessTokenKey = "DINGTALK_ACCTSS_TOKEN"; + /** + * Excel导出字段必填标识 + */ + String EXPORT_REQUIRED_SUFFIX = "(*)"; + + /** + * Excel导出字段必填高亮标识 + */ + String EXPORT_REQUIRED_HIGHLIGHT_STRING = "*"; + String siteRootDepartmentKey="siteRootDepartment"; String companyTypeFilterKey="companyTypeFilter"; /** diff --git a/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java b/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java index 3c4bea3..2023d70 100644 --- a/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java +++ b/xjrsoft-common/xjrsoft-common-mybatis/src/main/java/com/xjrsoft/common/mybatis/MybatisplusAutoConfiguration.java @@ -86,7 +86,8 @@ public class MybatisplusAutoConfiguration implements WebMvcConfigurer { return null; } try { - return new LongValue(SecureUtil.getTenantId()); + //return new LongValue(SecureUtil.getTenantId()); + return new LongValue(null); } catch (Exception e) { log.error("获取当前登录用户租户码失败"); diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java deleted file mode 100644 index ede1b85..0000000 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Department.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.xjrsoft.tenant.entity; - -import com.xjrsoft.common.core.domain.base.AuditEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 机构 - *

- * - * @author tzx - * @since 2022-03-02 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class Department extends AuditEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - private Long id; - - private String name; - - private Long parentId; - - private String code; - - private String mobile; - - private String email; - - private String website; - - private String address; - - private Integer sortCode; - - private String remark; - - private String hierarchy; - - private Integer departmentType; - - private Long tenantId; - - private String shortName; - - private Long departmentNature; - - private LocalDateTime establishedTime; - - private Long custodian; - - private String facsimile; - - private Long administrativeLeader; - - private Long partyCommitteeLeader; - - private String departmentLeaders; - - private String chargeOfLeaders; - - private String departmentLabel; - - private String extensionNumber; - - private Long industry; - - private String corporateLegalPerson; - - private String phoneNumber; - - private String contactNumber; - - private String depositBank; - - private String bankAccount; - - private String businessScope; - - private Long wechatDeptId; - - private Long dingtalkDeptId; - - private String dingAgentId; - - private String dingAppKey; - - private String dingAppSecret; -} diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java deleted file mode 100644 index 840f335..0000000 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Post.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.xjrsoft.tenant.entity; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - *

- * 岗位 - *

- * - * @author tzx - * @since 2022-03-02 - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class Post implements Serializable { - - private static final long serialVersionUID = 1L; - - private Long id; - - private String name; - - private String code; - - private Long parentId; - - private Integer sortCode; - - private String remark; - - private Long deptId; - - private Long tenantId; -} - diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java deleted file mode 100644 index 8e0aa84..0000000 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/Tenant.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.xjrsoft.tenant.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.xjrsoft.common.core.domain.base.AuditEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author tzx - * @since 2023-08-14 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("xjr_tenant") -public class Tenant extends AuditEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - private Long id; - - private String code; - - private String name; - - private LocalDateTime startTime; - - private LocalDateTime endTime; - - private String remark; - - private Integer sortCode; - -} diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java deleted file mode 100644 index 981908d..0000000 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/entity/User.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.xjrsoft.tenant.entity; - -import com.xjrsoft.common.core.domain.base.AuditEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 用户 - *

- * - * @author tzx - * @since 2022-03-02 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class User extends AuditEntity implements Serializable { - - private static final long serialVersionUID = 1L; - - private Long id; - - private String userName; - - private String name; - - private String code; - - private String nickName; - - private String password; - - private Integer gender; - - private String mobile; - - private Long postId; - - private String avatar; - - private String email; - - private String address; - - private Double longitude; - - private Double latitude; - - private Integer sortCode; - - private String remark; - - private Long departmentId; - - private String wechatNumber; - - private String qqNumber; - - private LocalDateTime birthDate; - - private Long tenantId; - - private String tenantCode; - - private Integer passwordAuthentication; - - private String phoneNumber; - - private String identityCardNumber; - - private Long politicsStatus; - - private Long administrativePost; - - private Long administrativeRank; - - private Long secretLevel; - - private Long professionalTitleGrade; - - private Long technicalPosition; - - private Long managerialPosition; - - private Long vocationalSkill; - - private String bindIp; -} diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java deleted file mode 100644 index 74bccf2..0000000 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/mapper/CommonTenantMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.xjrsoft.tenant.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xjrsoft.tenant.entity.Tenant; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author tzx - * @since 2023-08-14 - */ -@Mapper() -public interface CommonTenantMapper extends BaseMapper { - -} diff --git a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java index 7094510..22c57f1 100644 --- a/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java +++ b/xjrsoft-common/xjrsoft-common-tenant/src/main/java/com/xjrsoft/tenant/util/SecureUtil.java @@ -5,7 +5,7 @@ import cn.dev33.satoken.stp.StpUtil; import com.xjrsoft.common.core.constant.GlobalConstant; import com.xjrsoft.organization.entity.Post; import com.xjrsoft.organization.entity.User; -import com.xjrsoft.tenant.entity.Department; +import com.xjrsoft.organization.entity.Department; import java.util.ArrayList; import java.util.Arrays; diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml b/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml index 74948a9..1611b64 100644 --- a/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml +++ b/xjrsoft-service-api/xjrsoft-service-organization-api/pom.xml @@ -25,11 +25,11 @@ hutool-all - - com.xjrsoft - xjrsoft-service-system-api - ${xjrsoft.framework.version} - + + + + + com.xjrsoft @@ -51,11 +51,11 @@ ${justauth.version} - - com.xjrsoft - xjrsoft-common-tenant - ${xjrsoft.framework.version} - + + + + + diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java index a955cba..7fa1461 100644 --- a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java +++ b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserClientFallBack.java @@ -7,6 +7,7 @@ import com.xjrsoft.organization.vo.UserRoleVo; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Set; /** * @Author: tzx @@ -68,4 +69,9 @@ public class UserClientFallBack implements IUserClient { public User getUserByCodeFeign(String code) { return null; } + + @Override + public List getUserByIdsFeignSet(Set userIds) { + return null; + } } diff --git a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java index 4dfef6f..fa87f9f 100644 --- a/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java +++ b/xjrsoft-service-api/xjrsoft-service-organization-api/src/main/java/com/xjrsoft/organization/fallback/UserRoleRelationClientFallBack.java @@ -27,4 +27,9 @@ public class UserRoleRelationClientFallBack implements IUserRoleRelationClient { public boolean addUserRoleRelationFeign(UserRoleRelation userRoleRelation) { return false; } + + @Override + public List list(UserRoleRelation userRoleRelation) { + return null; + } } diff --git a/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java b/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java index d5cb5e2..d233c47 100644 --- a/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java +++ b/xjrsoft-service-api/xjrsoft-service-system-api/src/main/java/com/xjrsoft/system/fallback/MenuClientFallBack.java @@ -61,4 +61,14 @@ public class MenuClientFallBack implements IMenuClient { public List getAllMenuListFeign() { return null; } + + @Override + public Menu getOne(Menu menu) { + return null; + } + + @Override + public List getList(Menu menu) { + return null; + } }