1、增加企业用户的修改邮箱、修改密码接口

2、增加后台管理启用禁用接口

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

@@ -5,6 +5,7 @@ import com.citu.framework.common.pojo.CommonResult;
 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.common.util.string.StrUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.*;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -99,4 +100,38 @@ public class EnterpriseUserBindController {
     }
 
 
+    @PutMapping("/update-password")
+    @Operation(summary = "修改用户密码")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:update')")
+    public CommonResult<Boolean> updatePassword(@Valid @RequestBody EnterpriseUpdatePasswordReqVO reqVO) {
+        enterpriseUserBindService.updatePassword(reqVO.getId(), reqVO.getPassword());
+        return success(true);
+    }
+
+
+    @PutMapping("/update-email")
+    @Operation(summary = "修改用户邮箱")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:update')")
+    public CommonResult<Boolean> updateUserPassword(@Valid @RequestBody EnterpriseUpdatePasswordReqVO reqVO) {
+        enterpriseUserBindService.updateEmail(reqVO.getId(), reqVO.getPassword());
+        return success(true);
+    }
+
+
+    @PostMapping("/disable")
+    @Operation(summary = "禁用账户")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:update')")
+    public CommonResult<Boolean> disable(@RequestParam("ids") String ids) {
+        return success(enterpriseUserBindService.disable(StrUtils.splitToLong(ids)));
+    }
+
+
+    @PostMapping("/enable")
+    @Operation(summary = "启用账户")
+    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:update')")
+    public CommonResult<Boolean> enable(@RequestParam("ids") String ids) {
+        return success(enterpriseUserBindService.enable(StrUtils.splitToLong(ids)));
+    }
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/user/AppRecruitUserController.java

@@ -8,6 +8,8 @@ import com.citu.framework.idempotent.core.keyresolver.impl.UserIdempotentKeyReso
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.*;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserUpdateEmailReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUpdatePasswordReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterpriseEntitlementRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
@@ -100,14 +102,14 @@ public class AppRecruitUserController {
     @PutMapping("/update-email")
     @Operation(summary = "绑定/修改用户邮箱")
     @PreAuthenticated
-    public CommonResult<Boolean> updateUserEmail(@RequestBody @Valid AppRecruitEnterpriseUserUpdateEmailReqVO reqVO) {
+    public CommonResult<Boolean> updateUserEmail(@RequestBody @Valid EnterpriseUserUpdateEmailReqVO reqVO) {
         service.updateUserEmail(reqVO);
         return success(true);
     }
 
     @PutMapping("/update-password")
     @Operation(summary = "修改用户密码")
-    public CommonResult<Boolean> updateUserPassword(@Valid @RequestBody AppRecruitEnterpriseUpdatePasswordReqVO reqVO) {
+    public CommonResult<Boolean> updateUserPassword(@Valid @RequestBody EnterpriseUpdatePasswordReqVO reqVO) {
         service.updatePassword(reqVO.getId(), reqVO.getPassword());
         return success(true);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/user/vo/AppRecruitEnterpriseUpdatePasswordReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUpdatePasswordReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.recruit.user.vo;
+package com.citu.module.menduner.system.controller.base.enterprise.bind;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 
 @Schema(description = "用户重置密码 Request VO")
 @Data
-public class AppRecruitEnterpriseUpdatePasswordReqVO {
+public class EnterpriseUpdatePasswordReqVO {
 
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/user/vo/AppRecruitEnterpriseUserUpdateEmailReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserUpdateEmailReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.recruit.user.vo;
+package com.citu.module.menduner.system.controller.base.enterprise.bind;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -9,7 +9,7 @@ import javax.validation.constraints.Size;
 
 @Schema(description = "企业用户 - 绑定修改邮箱 Request VO")
 @Data
-public class AppRecruitEnterpriseUserUpdateEmailReqVO {
+public class EnterpriseUserUpdateEmailReqVO {
 
     @Schema(description = "id", example = "23697")
     private Long id;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobCvRelMapper.java

@@ -68,18 +68,18 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
         wrapper.eqIfExists(JobCvRelDO::getStatus, reqVO.getStatus());
         wrapper.eqIfExists(JobCvRelDO::getType, reqVO.getType());
         wrapper.eqIfExists(JobCvRelDO::getRecommendUserId, reqVO.getRecommendUserId());
-        wrapper.likeIfExists(JobCvRelDO::getName, reqVO.getName());
         wrapper.likeIfExists(JobCvRelDO::getPhone, reqVO.getPhone());
 
         // 投递的职位 inner 人才信息 (投递人)
         wrapper.innerJoin(PersonInfoDO.class, "person", PersonInfoDO::getUserId, JobCvRelDO::getUserId);
         // 人才相关的条件
         wrapper.likeIfExists("person.name", reqVO.getName());
+        wrapper.eqIfExists("person.job_status", reqVO.getJobStatus());
+        wrapper.eqIfExists("person.edu_type", reqVO.getEduType());
+        wrapper.eqIfExists("person.exp_type", reqVO.getExpType());
 
         // 投递的职位 inner 人才信息 (推荐人)
         wrapper.leftJoin(PersonInfoDO.class, "recommend", PersonInfoDO::getUserId, JobCvRelDO::getRecommendUserId);
-        // 人才相关的条件
-        wrapper.likeIfExists("recommend.name", reqVO.getName());
 
         setUnfitCandidate(wrapper);
 

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

@@ -5,10 +5,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppE
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.*;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.*;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 
 import javax.validation.Valid;
@@ -89,7 +86,7 @@ public interface EnterpriseUserBindService {
      *
      * @param reqVO
      **/
-    void updateUserEmail(AppRecruitEnterpriseUserUpdateEmailReqVO reqVO);
+    void updateUserEmail(EnterpriseUserUpdateEmailReqVO reqVO);
 
     /**
      * 根据企业id和用户id查询用户绑定数据
@@ -154,6 +151,14 @@ public interface EnterpriseUserBindService {
      */
     void updatePassword(Long id, String password);
 
+    /**
+     * 修改邮箱
+     *
+     * @param id
+     * @param email
+     **/
+    void updateEmail(Long id,String email);
+
     // ========== 求职端 ==========
 
     /**

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

@@ -11,10 +11,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppE
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.*;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.*;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -132,7 +129,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
 
     @Override
     @DSTransactional
-    public void updateUserEmail(AppRecruitEnterpriseUserUpdateEmailReqVO reqVO) {
+    public void updateUserEmail(EnterpriseUserUpdateEmailReqVO reqVO) {
         // 效验是否为企业用户
         checkIsEnterpriseUser();
 
@@ -235,6 +232,18 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
                 .password(passwordEncoder.encode(password)).build());
     }
 
+    @Override
+    public void updateEmail(Long id, String email) {
+        EnterpriseUserBindDO userBindDO = validateEnterpriseUserBindExists(id);
+        // 效验邮箱是否被占用
+        EnterpriseUserBindDO emailUser = mapper.selectByEmail(email);
+        if (null != emailUser) {
+            throw exception(MDE_USER_EMAIL_EXISTS_OTHER);
+        }
+        mapper.updateById(EnterpriseUserBindDO.builder().id(userBindDO.getId())
+                .email(email).build());
+    }
+
     @Override
     public EnterpriseUserContactRespVO getContact(Long enterpriseId, Long userId) {
         EnterpriseUserBindDO userBindDO = mapper.selectByEnterpriseIdAndUserId(enterpriseId, userId);