From e5f652d9af991c239aa59b017b6afb7e604233bb Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 9 Dec 2025 09:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=9C=A8=E7=BC=96=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=9C=A8=E7=BC=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/constant/UserStaffingTypeEnum.java    |   2 +-
 .../service/impl/SysUserServiceImpl.java      |   4 ++--
 .../src/main/resources/file/user.xlsx         | Bin 9169 -> 9183 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserStaffingTypeEnum.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserStaffingTypeEnum.java
index 91fd95cef..08bd0f0d5 100644
--- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserStaffingTypeEnum.java
+++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserStaffingTypeEnum.java
@@ -13,7 +13,7 @@ import java.util.Arrays;
 @Getter
 public enum UserStaffingTypeEnum {
     STAFFING("1", "在编"),
-    NONE_STAFFING("2", "非在编"),
+    NONE_STAFFING("2", "非编"),
     ;
     private final String type;
     private final String description;
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
index e8ef7b1f0..6b3cc21f2 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
@@ -529,7 +529,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             } else {
                 UserStaffingTypeEnum staffingTypeEnum = UserStaffingTypeEnum.valueOfByDescription(excel.getStaffingType());
                 if (ObjectUtil.isEmpty(staffingTypeEnum)) {
-                    errorMsg.add(MsgUtils.getMessage("编制选择错误,请选择`在编`和`非在编`", excel.getStaffingType()));
+                    errorMsg.add(MsgUtils.getMessage("编制选择错误,请选择<在编>和<非编>", excel.getStaffingType()));
                 } else {
                     excel.setStaffingTypeParse(staffingTypeEnum.getType());
                 }
@@ -636,7 +636,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 } else {
                     UserStaffingTypeEnum staffingTypeEnum = UserStaffingTypeEnum.valueOfByDescription(v.getStaffingType());
                     if (ObjectUtil.isEmpty(staffingTypeEnum)) {
-                        errorMsg.add("编制选择错误,请选择<在编>和<非在编>");
+                        errorMsg.add("编制选择错误,请选择<在编>和<非编>");
                     } else {
                         staffingType = staffingTypeEnum.getType();
                     }
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/file/user.xlsx b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/file/user.xlsx
index d86950f6a50ddf3fb7430b00bd9647b39b56eef6..af27f00d183920a87d2686ea083831865be1c8e3 100644
GIT binary patch
delta 1714
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
I9{>OV0Ka4?jsO4v

delta 1677
zcmV;826Fk|N6|;HkpT_@EYR&#0RRAD0ssIJ0Fx0R6Mub@-%7(U6vpob-=XBbP14~e
zq3!Sw1Hs|IisD^J&bDHkmL%Hk5xnyed=Ot}?_t_*wL|eT=ljm@eCLp8x+!w+4YbKh
z6(brD<be{U%+xAI59!Q5N1m}<NuHMqVzdQ=rpf6^Bq}CK4GUdXplt@mb0lS$sA9CX
zwqh6?v44hwo4`4g6PKkfxOGpx!W9=Ud<8fpWQ+^2Tyo2C1N5t&i1tV+dSvyg^A;cl
zh8zk|)?gY?{NuHt3-f0~s|=h)X1A5wX&-mUmZB4T_r_$sv99Z&9<?!Ceu|&wxA*O;
zex{mR2|!6C1rr*$Ep>9?wq1j_xVwq)pxm4==T^qf-L;n)$jfcA`}*8{yhr%A;&^TR
z4hqt9fmj#+pgfMQuG1MxLK0G+hCT^XLKzJiA<xa=qy8pfS19)5|0kZc#7RoWES#{>
zctAV=k~a78r%1j5vjzjQ0SS43Wc9QH000G(!2}_HOK#gR5ZxE(9S9=msu8957rT;!
z#E$C}2oUs>u4##~2ved$QkHX(uG+49h+d~CdW#Mv%eAU3;)O-dJihro(!bcH0&SVn
zTxJ3G92X;&g)-vVI>4VkE>6!e(uQUc6*6N1eq<V7Okck6OQ|+GVay<4$aH`cWAX_h
zI!su9O0^?%mVqahDy0UtYE5*m7>%k!sUT;rJ0vOP8Lk;7>Ny-Tj(N!DGAvS-nVLi~
zK@H@u6Q1jaZ5KU@FH*FGTAO^1Qk>VG1E1IL<d^bLNiAdJgfb;{YTYWwWZbGV4Ld|n
zG%KZQQ{<;WoI`OdF1UHD%54&2<{wX4mQI;}YbVV1SsXRU8xdw^g*GysQ$z98uO@J(
z$kdNGbkU9;DHaF#(wn^VFxV@^J!hppS|dYOADCdFVG&3LBP)TGlp71Y0h4RFD}ZIB
zq2XILV?qRYX;t)4#egLQAcqLY>n7Tw63v}L5sPUd%uI^UJTggu$GEY*m*tZ2bz&fY
zm7!CShEf0n{G*gxF=Ld{9ehF4WqrH{%dl$2p0BEw)Ca4SY>TG8k|hH90E6Z4!&m3j
zirkw38^o~QOKYw`fYD&xPF<gDp`dV&xauOjHe%LAoV5}2E~3{)Tz3)uHe%654BCjd
zUBs}BSauPkHsYp>IBz3BT>p1$d_WL?XnG@tdI}ND;+_f)UwgYzD2vRF8(Q6VA@i8S
z+a$O)7*Qc)c_nDJsb-@SS>9xMVQ!h$bPX_@1Q@TClB#9g3-rXBEKfYQe?AxuA(VZ=
z3PHW;tA|3GH^09A`2F+C>p$PV*Q?s<lLO2r?c|`QwgEJnLn60StvOUBSPVrsxz2Dr
z?zw~JH^fNQ>VCpwWNuH41{kfRfs5Vj5_n%3NYizC7{yYWW&>BQ_AM%-y@7`ZeEJu&
zpa+Qu1$R&HUcQqq4;+76Z<{a_exJ1eVELUGNaz9zRG|c|Qd3oFnr%;$2Zvx4Y-Bql
z)3pCS1EJm2Y2xWz{GIPyy}CZv75WZRF~LLZ%xsK+XCi0(7~-dWYArERn(~}hf<uUZ
zfWp_&`**8W$mefDJR?KERftQin}86Nl~7YP6Af_lQV3a7ZA^c8B&v}>b5#Q9x+1P^
zUy+(Jjt7Q7PT>$m!7@lhcB+BvfkZ+@wJBeftWh{x6|928&=I0db5Cni_qoETqDpUa
zrXdgU+?b+;SBHm@JT>u&Rp!;7+b$;2OOp@M7+tpq2CaJacP45X&qezY*s;_hcHM<*
zcd_ITeBZQ*>m`5UeMP<QnCW%{xiv|RE(2y1d7C>u!x)y)DtnNq6Fty(Y}fA)aMpK9
z_Y$2X3-Qm`TgLX>cdbS0q}IamZ7Yti7M7Q!bMJ$b+-$t`*EsTX$5_0Xd(AQ_lqmEp
z6Ezt|{$_j5lJwC)^+}qeh*kqz(0S8~_r+NZj!Wx*B?v=yN!Q9H`hUPjbCeZK1gD3I
zz?=K+emfC+x7mOFluiY&w{fzbj$iL~>o5Dw=P?EO=Rk?sxjC+J^JM&o(Qi;o0|b*@
zA{w(M5ylPy9Fy%IKmmo5E+8`jsgq(LlLP`R(Cw4?AjbjGlffZ20{9%0`5{ID$CE%J
zK@Iv4004MwFLQKxY-MwkVId%st|ATrl#{(8HUYbn^dcq&cTewLzLOs#6#);EH6vaL
Xd4FW}v;qJC1(Td3JqENN00000?9LQ7