1、增加简历附件保存、查询、移除接口

2、增加企业用户加入审批接口

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -134,6 +134,7 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_AUTH_AUTHORIZATION_CODE_NOT_NULL = new ErrorCode(1_002_000_012, "授权码不能为空");
     ErrorCode MDE_AUTH_SOCIAL_TYPE_NOT_NULL = new ErrorCode(1_002_000_013, "社交平台的类型不能为空");
     ErrorCode MDE_AUTH_CAPTCHA_CODE_NOT_NULL = new ErrorCode(1_002_000_014, "验证码不能为空");
+    ErrorCode MDE_USER_ENTERPRISE_NOT_EXISTS = new ErrorCode(1_200_000_015, "未选择企业");
 
 
     // ========== 角色模块 1_200_003_000 ==========

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/enterprise/EnterpriseUserApplyAuditStatusEnum.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 企业注册信息审核状态 0审核中 1审核通过 2审核不通过
+ * 企业用户申请 0审核中 1审核通过 2审核不通过
  **/
 @Getter
 @AllArgsConstructor

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/enterprise/EnterpriseUserTypeEnum.java

@@ -0,0 +1,19 @@
+package com.citu.module.menduner.system.enums.enterprise;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 企业用户类型 0普通企业用户 1 企业管理员
+ **/
+@Getter
+@AllArgsConstructor
+public enum EnterpriseUserTypeEnum {
+
+    NORMAL("0", "普通企业用户"),
+    ADMIN("1", "企业管理员");
+
+    final String name;
+    final String type;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseUserApplyController.java

@@ -6,6 +6,8 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
+import com.citu.module.menduner.system.controller.admin.enterprise.user.EnterpriseUserApplyAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.user.EnterpriseUserApplyPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.user.EnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseUserApplySaveReqVO;
@@ -90,4 +92,20 @@ public class EnterpriseUserApplyController {
                 BeanUtils.toBean(list, EnterpriseUserApplyRespVO.class));
     }
 
+    @PutMapping("/approved")
+    @Operation(summary = "审核通过")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-apply:update')")
+    public CommonResult<Boolean> approved(@Valid @RequestBody EnterpriseUserApplyAuditReqVO reqVO) {
+        enterpriseUserApplyService.approved(reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/reject")
+    @Operation(summary = "审核拒绝驳回")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-apply:update')")
+    public CommonResult<Boolean> reject(@Valid @RequestBody EnterpriseUserApplyAuditReqVO reqVO) {
+        enterpriseUserApplyService.reject(reqVO);
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthLoginReqVO.java

@@ -16,9 +16,6 @@ import javax.validation.constraints.NotEmpty;
 
 @Schema(description = "menduner - 手机 + 密码登录 Request VO,如果登录并绑定社交用户，需要传递 social 开头的参数")
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class AppMdeAuthLoginReqVO {
 
     @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/enterprise/AppEnterpriseAuthLoginReqVO.java

@@ -0,0 +1,23 @@
+package com.citu.module.menduner.system.controller.app.auth.vo.enterprise;
+
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginReqVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "menduner 企业- 手机 + 密码登录 Request VO,如果登录并绑定社交用户，需要传递 social 开头的参数")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AppEnterpriseAuthLoginReqVO extends AppMdeAuthLoginReqVO {
+
+    @NotNull(message = "{1_200_000_015}")
+    @Schema(description = "企业id", example = "616")
+    private Long enterpriseId;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/enterprise/AppEnterpriseAuthSmsLoginReqVO.java

@@ -0,0 +1,20 @@
+package com.citu.module.menduner.system.controller.app.auth.vo.enterprise;
+
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthSmsLoginReqVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "menduner 企业- 手机 + 验证码登录 Request VO,如果登录并绑定社交用户，需要传递 social 开头的参数")
+@Data
+public class AppEnterpriseAuthSmsLoginReqVO extends AppMdeAuthSmsLoginReqVO {
+
+    @NotNull(message = "{1_200_000_015}")
+    @Schema(description = "企业id", example = "616")
+    private Long enterpriseId;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseRegisterController.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.app.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterRespVO;
@@ -25,6 +26,7 @@ public class AppEnterpriseRegisterController {
     private EnterpriseRegisterService enterpriseRegisterService;
 
 
+    @PreAuthenticated
     @PostMapping("/apply")
     @Operation(summary = "企业注册申请")
     public CommonResult<Boolean> apply(@RequestBody @Valid AppEnterpriseRegisterReqVO reqVO) {
@@ -32,6 +34,7 @@ public class AppEnterpriseRegisterController {
         return success(true);
     }
 
+    @PreAuthenticated
     @GetMapping("/by/user")
     @Operation(summary = "获取当前用户提交的企业申请")
     public CommonResult<AppEnterpriseRegisterRespVO> getApplyByUserId() {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseUserApplyController.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.app.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserApplyReqVO;
@@ -25,6 +26,7 @@ public class AppEnterpriseUserApplyController {
     @Resource
     private EnterpriseUserApplyService enterpriseUserApplyService;
 
+    @PreAuthenticated
     @PostMapping("/apply")
     @Operation(summary = "加入企业申请")
     public CommonResult<Boolean> apply(@RequestBody @Valid AppEnterpriseUserApplyReqVO reqVO) {
@@ -32,6 +34,7 @@ public class AppEnterpriseUserApplyController {
         return success(true);
     }
 
+    @PreAuthenticated
     @GetMapping("/by/user")
     @Operation(summary = "获取申请加入信息")
     public CommonResult<AppEnterpriseUserApplyRespVO> getApplyByUserId() {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonResumeController.java

@@ -2,6 +2,8 @@ package com.citu.module.menduner.system.controller.app.person;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentRespVO;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentSaveReqVO;
 import com.citu.module.menduner.system.controller.app.person.eduexp.AppEduExpRespVO;
 import com.citu.module.menduner.system.controller.app.person.eduexp.AppEduExpSaveReqVO;
 import com.citu.module.menduner.system.controller.app.person.job.AppJobInterestedRespVO;
@@ -17,12 +19,14 @@ import com.citu.module.menduner.system.controller.app.person.vo.AppPersonSkillSa
 import com.citu.module.menduner.system.controller.app.person.workexp.AppWorkExpRespVO;
 import com.citu.module.menduner.system.controller.app.person.workexp.AppWorkExpSaveReqVO;
 import com.citu.module.menduner.system.convert.*;
+import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobInterestedDO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
 import com.citu.module.menduner.system.dal.dataobject.projectexp.ProjectExpDO;
 import com.citu.module.menduner.system.dal.dataobject.trainexp.TrainExpDO;
 import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
+import com.citu.module.menduner.system.service.cvattachment.CvAttachmentService;
 import com.citu.module.menduner.system.service.eduexp.EduExpService;
 import com.citu.module.menduner.system.service.job.JobInterestedService;
 import com.citu.module.menduner.system.service.person.info.PersonInfoService;
@@ -70,6 +74,9 @@ public class AppPersonResumeController {
     @Resource
     private PersonSkillService personSkillService;
 
+    @Resource
+    private CvAttachmentService cvAttachmentService;
+
     @PreAuthenticated
     @PostMapping("/save/info")
     @Operation(summary = "保存基本信息")
@@ -242,4 +249,29 @@ public class AppPersonResumeController {
         return success(PersonConvert.INSTANCE.convertList(list));
     }
 
+    // ========== 简历附件 ==========
+    @PreAuthenticated
+    @GetMapping("/get/person/cv")
+    @Operation(summary = "获取附件列表")
+    public CommonResult<List<AppCvAttachmentRespVO>> getCvAttachmentList() {
+        List<CvAttachmentDO> list = cvAttachmentService.getCvAttachmentList();
+        return success(CvAttachmentConvert.INSTANCE.convertList(list));
+    }
+
+    @PreAuthenticated
+    @PostMapping("/save/person/cv")
+    @Operation(summary = "保存附件")
+    public CommonResult<Boolean> savePersonSkill(@Valid @RequestBody AppCvAttachmentSaveReqVO reqVO) {
+        cvAttachmentService.create(reqVO);
+        return success(true);
+    }
+
+    @PreAuthenticated
+    @DeleteMapping("/remove/person/cv")
+    @Operation(summary = "移除附件")
+    public CommonResult<Boolean> remove(@RequestParam("id") Long id) {
+        cvAttachmentService.remove(id);
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/cvattachment/AppCvAttachmentRespVO.java

@@ -0,0 +1,27 @@
+package com.citu.module.menduner.system.controller.app.person.cvattachment;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 简历附件 Response VO")
+@Data
+public class AppCvAttachmentRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25962")
+    private Long id;
+
+    @Schema(description = "简历附件标题")
+    private String title;
+
+    @Schema(description = "简历附件地址", example = "https://www.iocoder.cn")
+    private String url;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/cvattachment/AppCvAttachmentSaveReqVO.java

@@ -0,0 +1,16 @@
+package com.citu.module.menduner.system.controller.app.person.cvattachment;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "menduner - 简历附件 Request VO")
+@Data
+public class AppCvAttachmentSaveReqVO {
+
+    @Schema(description = "简历附件标题")
+    private String title;
+
+    @Schema(description = "简历附件地址", example = "https://www.iocoder.cn")
+    private String url;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/CvAttachmentConvert.java

@@ -0,0 +1,16 @@
+package com.citu.module.menduner.system.convert;
+
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentRespVO;
+import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface CvAttachmentConvert {
+
+    CvAttachmentConvert INSTANCE = Mappers.getMapper(CvAttachmentConvert.class);
+
+    List<AppCvAttachmentRespVO> convertList(List<CvAttachmentDO> list);
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/PersonConvert.java

@@ -13,4 +13,5 @@ public interface PersonConvert {
     PersonConvert INSTANCE = Mappers.getMapper(PersonConvert.class);
 
     List<AppPersonSkillRespVO> convertList(List<PersonSkillDO> list);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/cvattachment/CvAttachmentMapper.java

@@ -7,6 +7,8 @@ import com.citu.module.menduner.system.controller.admin.cvattachment.vo.CvAttach
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 简历附件 Mapper
  *
@@ -24,4 +26,8 @@ public interface CvAttachmentMapper extends BaseMapperX<CvAttachmentDO> {
                 .orderByDesc(CvAttachmentDO::getId));
     }
 
+    default List<CvAttachmentDO> selectListByUserId(Long userId) {
+        return selectList(new LambdaQueryWrapperX<CvAttachmentDO>()
+                .eq(CvAttachmentDO::getUserId, userId));
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseRegisterMapper.java

@@ -34,4 +34,10 @@ public interface EnterpriseRegisterMapper extends BaseMapperX<EnterpriseRegister
         queryWrapper.orderByDesc(EnterpriseRegisterDO::getUpdateTime).last("LIMIT 1");
         return selectOne(queryWrapper);
     }
+
+    default Long selectCountByUserIdAndStatus(Long userId, String status) {
+        return selectCount(new LambdaQueryWrapperX<EnterpriseRegisterDO>()
+                .eq(EnterpriseRegisterDO::getUserId, userId)
+                .eq(EnterpriseRegisterDO::getStatus, status));
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserApplyMapper.java

@@ -33,4 +33,10 @@ public interface EnterpriseUserApplyMapper extends BaseMapperX<EnterpriseUserApp
         queryWrapper.orderByDesc(EnterpriseUserApplyDO::getUpdateTime).last("LIMIT 1");
         return selectOne(queryWrapper);
     }
+
+    default Long selectCountByUserIdAndStatus(Long userId, String status) {
+        return selectCount(new LambdaQueryWrapperX<EnterpriseUserApplyDO>()
+                .eq(EnterpriseUserApplyDO::getUserId, userId)
+                .eq(EnterpriseUserApplyDO::getStatus, status));
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthService.java

@@ -85,4 +85,7 @@ public interface MdeAuthService {
      * @return 登录结果
      */
     AppMdeAuthLoginRespVO refreshToken(String refreshToken);
+
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthService.java

@@ -0,0 +1,34 @@
+package com.citu.module.menduner.system.service.auth;
+
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthSmsLoginReqVO;
+
+import javax.validation.Valid;
+
+/**
+ * menduner 企业的认证 Service 接口
+ * 提供用户的账号密码登录、token 的校验等认证相关的功能
+ *
+ * @author rayson
+ */
+public interface MdeEnterpriseAuthService {
+
+    /**
+     * 手机 + 密码登录
+     *
+     * @param reqVO 登录信息
+     * @return 登录结果
+     */
+    AppMdeAuthLoginRespVO login(@Valid AppEnterpriseAuthLoginReqVO reqVO);
+
+    /**
+     * 手机 + 验证码登陆
+     *
+     * @param reqVO 登陆信息
+     * @return 登录结果
+     */
+    AppMdeAuthLoginRespVO smsLogin(@Valid AppEnterpriseAuthSmsLoginReqVO reqVO);
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthServiceImpl.java

@@ -0,0 +1,48 @@
+package com.citu.module.menduner.system.service.auth;
+
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.user.MdeUserService;
+import com.citu.module.system.api.logger.LoginLogApi;
+import com.citu.module.system.api.oauth2.OAuth2TokenApi;
+import com.citu.module.system.api.sms.SmsCodeApi;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+/**
+ * menduner 的企业认证 Service 接口 实现
+ *
+ * @author rayson
+ **/
+@Service
+@Validated
+public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService{
+
+    @Resource
+    private MdeUserService userService;
+    @Resource
+    private SmsCodeApi smsCodeApi;
+    @Resource
+    private LoginLogApi loginLogApi;
+    @Resource
+    private OAuth2TokenApi oauth2TokenApi;
+    @Resource
+    private EnterpriseUserBindService bindService;
+
+
+    @Override
+    public AppMdeAuthLoginRespVO login(AppEnterpriseAuthLoginReqVO reqVO) {
+        return null;
+    }
+
+    @Override
+    public AppMdeAuthLoginRespVO smsLogin(AppEnterpriseAuthSmsLoginReqVO reqVO) {
+        return null;
+    }
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/cvattachment/CvAttachmentService.java

@@ -3,9 +3,12 @@ package com.citu.module.menduner.system.service.cvattachment;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.cvattachment.vo.CvAttachmentPageReqVO;
 import com.citu.module.menduner.system.controller.admin.cvattachment.vo.CvAttachmentSaveReqVO;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentRespVO;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 简历附件 Service 接口
@@ -52,4 +55,15 @@ public interface CvAttachmentService {
      */
     PageResult<CvAttachmentDO> getCvAttachmentPage(CvAttachmentPageReqVO pageReqVO);
 
+    /**
+     * 获得简历附件分页
+     *
+     * @param reqVO 分页查询
+     * @return 简历附件分页
+     */
+    void create(AppCvAttachmentSaveReqVO reqVO);
+
+    void remove(Long id);
+
+    List<CvAttachmentDO> getCvAttachmentList();
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/cvattachment/CvAttachmentServiceImpl.java

@@ -1,18 +1,23 @@
 package com.citu.module.menduner.system.service.cvattachment;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.cvattachment.vo.CvAttachmentPageReqVO;
 import com.citu.module.menduner.system.controller.admin.cvattachment.vo.CvAttachmentSaveReqVO;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentRespVO;
+import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentSaveReqVO;
+import com.citu.module.menduner.system.convert.CvAttachmentConvert;
+import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
+import com.citu.module.menduner.system.dal.mysql.cvattachment.CvAttachmentMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-
-import com.citu.module.menduner.system.dal.mysql.cvattachment.CvAttachmentMapper;
+import javax.annotation.Resource;
+import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CV_ATTACHMENT_NOT_EXISTS;
 
 /**
@@ -69,4 +74,27 @@ public class CvAttachmentServiceImpl implements CvAttachmentService {
         return cvAttachmentMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    @DSTransactional
+    public void create(AppCvAttachmentSaveReqVO reqVO) {
+        // 插入
+        CvAttachmentDO cvAttachment = BeanUtils.toBean(reqVO, CvAttachmentDO.class);
+        cvAttachment.setUserId(getLoginUserId());
+        cvAttachmentMapper.insert(cvAttachment);
+    }
+
+    @Override
+    @DSTransactional
+    public void remove(Long id) {
+        // 校验存在
+        validateCvAttachmentExists(id);
+        // 删除
+        cvAttachmentMapper.deleteById(id);
+    }
+
+    @Override
+    public List<CvAttachmentDO> getCvAttachmentList() {
+        Long userId = getLoginUserId();
+        return cvAttachmentMapper.selectListByUserId(userId);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -5,8 +5,6 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.datapermission.core.annotation.DataPermission;
-import com.citu.framework.es.core.filter.ESFieldFilter;
-import com.citu.framework.es.core.util.ESUtils;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseSaveReqVO;
@@ -25,21 +23,13 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
-import com.citu.module.menduner.system.util.EsQueryBuildUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertSet;
@@ -160,7 +150,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         EnterpriseBusinessDO business = enterpriseBusinessMapper.selectByEnterpriseId(id);
         respVO.setBusiness(EnterpriseConvert.INSTANCE.convert4(business));
 
-        List<EnterpriseAddressDO> addresseList =  enterpriseAddressMapper.selectByEnterpriseId(id);
+        List<EnterpriseAddressDO> addresseList = enterpriseAddressMapper.selectByEnterpriseId(id);
         respVO.setAddressList(EnterpriseConvert.INSTANCE.convertList(addresseList));
 
         return respVO;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -148,7 +148,9 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
     @Override
     @DSTransactional
     public void apply(AppEnterpriseRegisterReqVO reqVO) {
-        if (enterpriseRegisterMapper.selectCount(EnterpriseRegisterDO::getUserId, getLoginUserId()) > 0) {
+        if (enterpriseRegisterMapper.selectCountByUserIdAndStatus( getLoginUserId(),
+                EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()) > 0) {
+            // 存在审批中的申请
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
         EnterpriseRegisterDO register = EnterpriseConvert.INSTANCE.convert6(reqVO);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/user/EnterpriseUserApplyServiceImpl.java

@@ -15,6 +15,7 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserApplyM
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserApplyAuditStatusEnum;
+import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseUserApplyService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -131,13 +132,16 @@ public class EnterpriseUserApplyServiceImpl implements EnterpriseUserApplyServic
         userBindDO.setName(userApplyDO.getName());
         userBindDO.setPostId(userApplyDO.getPostId());
         userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+        userBindDO.setUserType(EnterpriseUserTypeEnum.NORMAL.getType());
         userBindMapper.insert(userBindDO);
     }
 
     @Override
     @DSTransactional
     public void apply(AppEnterpriseUserApplyReqVO reqVO) {
-        if (enterpriseUserApplyMapper.selectCount(EnterpriseUserApplyDO::getUserId, getLoginUserId()) > 0) {
+        if (enterpriseUserApplyMapper
+                .selectCountByUserIdAndStatus(getLoginUserId(),
+                        EnterpriseUserApplyAuditStatusEnum.AUDITING.getStatus()) > 0) {
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
         EnterpriseUserApplyDO applyDO = EnterpriseConvert.INSTANCE.convert10(reqVO);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/permission/MdeRoleServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.collection.CollectionUtils;
 import com.citu.framework.common.util.object.BeanUtils;
@@ -26,7 +25,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
@@ -46,12 +44,13 @@ import static com.citu.module.menduner.system.enums.MdeLogRecordConstants.*;
 @Slf4j
 public class MdeRoleServiceImpl implements MdeRoleService {
 
+    private final static String MENDUNER_DEFAULT_ROLE = "menduner_default_role";
+    private final static String MENDUNER_ENTERPRISE_ROLE = "menduner_enterprise_role";
+    private final static String MENDUNER_ENTERPRISE_USER_ROLE = "menduner_enterprise_user_role";
     @Resource
     private MdePermissionService permissionService;
-
     @Resource
     private MdeRoleMapper roleMapper;
-
     @Resource
     private MdeUserRoleMapper mdeUserRoleMapper;
 
@@ -182,7 +181,7 @@ public class MdeRoleServiceImpl implements MdeRoleService {
 
     @Override
     public MdeRoleDO getRoleByDefault() {
-        MdeRoleDO role = roleMapper.selectOne(MdeRoleDO::getCode,"menduner_default_role",MdeRoleDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
+        MdeRoleDO role = roleMapper.selectOne(MdeRoleDO::getCode, MENDUNER_DEFAULT_ROLE, MdeRoleDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
         if (role == null) {
             throw exception(MDE_ROLE_NOT_EXISTS);
         }

menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -117,6 +117,7 @@
 1_002_000_012=Authorization code cannot be empty
 1_002_000_013=The type of social platform cannot be empty
 1_002_000_014=The verification code cannot be empty
+1_200_000_015=No enterprise selected
 # ========== 角色模块 1_200_003_000 ==========
 1_200_003_001=Character does not exist
 1_200_003_002=A role named [{}] already exists

menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -118,6 +118,7 @@
 1_002_000_012=授权码不能为空
 1_002_000_013=社交平台的类型不能为空
 1_002_000_014=验证码不能为空
+1_200_000_015=未选择企业
 # ========== 角色模块 1_200_003_000 ==========
 1_200_003_001=角色不存在
 1_200_003_002=已经存在名为【{}】的角色