xieb
2024-01-15 c4d8a0ec627cfc0a0e1d14501a2f9ae188e226b4
用户模板导入
4 files modified
37 ■■■■■ changed files
src/main/java/org/springblade/common/enums/DictEnum.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/entity/User.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/excel/UserExcel.java 27 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/enums/DictEnum.java
@@ -88,6 +88,10 @@
     * 用户平台
     */
    USER_TYPE("user_type"),
    EDUCATION_BACKGROUND("education_background"),
    EMPLOYEE_TYPE("employee_type"),
    ;
    final String name;
src/main/java/org/springblade/modules/system/entity/User.java
@@ -82,7 +82,7 @@
    /**
     * 入职时间
     */
    private String entryJobTime;
    private Date entryJobTime;
    /**
     * 生日
     */
src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -98,4 +98,31 @@
    @ExcelProperty("生日")
    private Date birthday;
    /**
     * 身份证号码
     */
    @ColumnWidth(50)
    @ExcelProperty("身份证号码")
    private String cardNo;
    /**
     * 学历
     */
    @ColumnWidth(20)
    @ExcelProperty("学历")
    private String educationBackground;
    /**
     * 入职时间
     */
    @ColumnWidth(20)
    @ExcelProperty("入职时间")
    private Date entryJobTime;
    /**
     * 合伙人等级
     */
    @ColumnWidth(20)
    @ExcelProperty("合伙人等级")
    private String employeeType;
}
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -323,6 +323,10 @@
            user.setPostId(Func.toStrWithEmpty(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()), StringPool.EMPTY));
            // 设置角色ID
            user.setRoleId(Func.toStrWithEmpty(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()), StringPool.EMPTY));
            // 设置员工类型
            user.setEmployeeType(Func.toInt(DictCache.getKey(DictEnum.EMPLOYEE_TYPE, userExcel.getEmployeeType()), 1));
            // 设置学历
            user.setEducationBackground(Func.toStr(DictCache.getKey(DictEnum.EDUCATION_BACKGROUND, userExcel.getEducationBackground()), "1"));
            // 设置租户ID
            if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
                user.setTenantId(AuthUtil.getTenantId());