非在编改为在编

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;

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();
                     }