1、丰富企业招聘会的字段

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

@@ -107,6 +107,20 @@ public class AppPersonResumeController {
         return success(true);
     }
 
+    @PreAuthenticated
+    @PostMapping("/info/simple/save")
+    @Operation(summary = "保存简易基本信息")
+    @Idempotent(keyResolver = UserIdempotentKeyResolver.class)
+    public CommonResult<Boolean> saveSimple(@Valid @RequestBody AppPersonInfoSaveSimpleReqVO reqVO) {
+        if (ObjectUtil.isNotEmpty(reqVO.getInterestedList())) {
+            reqVO.getInterestedList().forEach(interested -> jobInterestedService.saveJobInterested(interested));
+        }
+        if (null != reqVO.getWorkExpList()) {
+            reqVO.getWorkExpList().forEach(workExp -> workExpService.saveWorkExp(workExp));
+        }
+        return success(personInfoService.saveSimple(reqVO));
+    }
+
 
     @PreAuthenticated
     @PostMapping("/tag/update")
@@ -118,7 +132,6 @@ public class AppPersonResumeController {
         return success(true);
     }
 
-
     @PreAuthenticated
     @PostMapping("/avatar/update")
     @Operation(summary = "修改人才头像")
@@ -128,19 +141,6 @@ public class AppPersonResumeController {
         return success(true);
     }
 
-    @PreAuthenticated
-    @PostMapping("/info/simple/save")
-    @Operation(summary = "保存简易基本信息")
-    @Idempotent(keyResolver = UserIdempotentKeyResolver.class)
-    public CommonResult<Boolean> saveSimple(@Valid @RequestBody AppPersonInfoSaveSimpleReqVO reqVO) {
-        if (ObjectUtil.isNotEmpty(reqVO.getInterestedList())) {
-            reqVO.getInterestedList().forEach(interested -> jobInterestedService.saveJobInterested(interested));
-        }
-        if (null != reqVO.getWorkExpList()) {
-            reqVO.getWorkExpList().forEach(workExp -> workExpService.saveWorkExp(workExp));
-        }
-        return success(personInfoService.saveSimple(reqVO));
-    }
 
     @PreAuthenticated
     @PostMapping("/job/status/update")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/fair/AppRecruitFairController.java

@@ -104,7 +104,7 @@ public class AppRecruitFairController {
     @Operation(summary = "效验是否有权限参加招聘会")
     public CommonResult<Boolean> checkPermission(@RequestParam("jobFairId") Long jobFairId) {
         fairService.checkFairWhite(jobFairId);
-        fairService.syncJob(jobFairId);
+//        fairService.syncJob(jobFairId);
         return success(true);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairRespVO.java

@@ -30,9 +30,13 @@ public class JobFairRespVO {
     @ExcelProperty("口号")
     private String slogan;
 
+    @Schema(description = "预览图")
+    @ExcelProperty("预览图")
+    private String previewImg;
+
     @Schema(description = "头图")
     @ExcelProperty("头图")
-    private String headImg;
+    private List<String> headImg;
 
     @Schema(description = "背景图")
     @ExcelProperty("背景图")
@@ -42,9 +46,13 @@ public class JobFairRespVO {
     @ExcelProperty("底图")
     private String bottomImg;
 
+    @Schema(description = "预览图PC")
+    @ExcelProperty("预览图PC")
+    private String pcPreviewImg;
+
     @Schema(description = "头图_PC")
     @ExcelProperty("头图_PC")
-    private String pcHeadImg;
+    private List<String> pcHeadImg;
 
     @Schema(description = "背景图_PC")
     @ExcelProperty("背景图_PC")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairSaveReqVO.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.base.fair;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -27,8 +28,11 @@ public class JobFairSaveReqVO {
     @Schema(description = "口号")
     private String slogan;
 
+    @Schema(description = "预览图")
+    private String previewImg;
+
     @Schema(description = "头图")
-    private String headImg;
+    private List<String> headImg;
 
     @Schema(description = "背景图")
     private String backgroundImg;
@@ -36,8 +40,11 @@ public class JobFairSaveReqVO {
     @Schema(description = "底图")
     private String bottomImg;
 
+    @Schema(description = "预览图PC")
+    private String pcPreviewImg;
+
     @Schema(description = "头图_PC")
-    private String pcHeadImg;
+    private List<String> pcHeadImg;
 
     @Schema(description = "背景图_PC")
     private String pcBackgroundImg;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairDO.java

@@ -44,10 +44,15 @@ public class FairDO extends TenantBaseDO {
      * 口号
      */
     private String slogan;
+    /**
+     * 预览图
+     */
+    private String previewImg;
     /**
      * 头图
      */
-    private String headImg;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> headImg;
     /**
      * 背景图
      */
@@ -56,10 +61,15 @@ public class FairDO extends TenantBaseDO {
      * 底图
      */
     private String bottomImg;
+    /**
+     * 预览图PC
+     */
+    private String pcPreviewImg;
     /**
      * 头图_PC
      */
-    private String pcHeadImg;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> pcHeadImg;
     /**
      * 背景图_PC
      */

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

@@ -4,8 +4,11 @@ package com.citu.module.menduner.system.dal.mysql.enterprise;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterpriseEntitlementPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseEntitlementDO;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -31,4 +34,12 @@ public interface EnterpriseEntitlementMapper extends BaseMapperX<EnterpriseEntit
                 .eq(EnterpriseEntitlementDO::getEnterpriseId, enterpriseId));
     }
 
+    default List<EnterpriseEntitlementDO> selectListByJobFairIsTrue() {
+        MPJLambdaWrapperX<EnterpriseEntitlementDO> wrapper = new MPJLambdaWrapperX<EnterpriseEntitlementDO>();
+        wrapper.innerJoin(EnterpriseDO.class, on -> on.eq(EnterpriseEntitlementDO::getEnterpriseId, EnterpriseDO::getId));
+        wrapper.eq(EnterpriseEntitlementDO::getJobFair, true);
+        wrapper.eq(EnterpriseDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
+        return selectJoinList(EnterpriseEntitlementDO.class,wrapper);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/fair/FairWhiteMapper.java

@@ -26,10 +26,6 @@ public interface FairWhiteMapper extends BaseMapperX<FairWhiteDO> {
         return selectOne(FairWhiteDO::getJobFairId, jobFairId, FairWhiteDO::getEnterpriseId, enterpriseId);
     }
 
-    default FairWhiteDO selectByJobFairIdAndEnterpriseName(Long jobFairId, String name) {
-        return selectOne(FairWhiteDO::getJobFairId, jobFairId, FairWhiteDO::getName, name);
-    }
-
     default List<FairWhiteDO> selectByJobFairIdAndEnterpriseNameList(Long jobFairId, String name) {
         return selectList(new LambdaQueryWrapperX<FairWhiteDO>()
                 .eq(FairWhiteDO::getJobFairId, jobFairId)

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

@@ -89,9 +89,14 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     @Override
     public void updateEnterpriseUserBind(EnterpriseUserBindSaveReqVO updateReqVO) {
         // 校验存在
-        validateEnterpriseUserBindExists(updateReqVO.getId());
+        EnterpriseUserBindDO userBindDO = validateEnterpriseUserBindExists(updateReqVO.getId());
         // 更新
         EnterpriseUserBindDO updateObj = BeanUtils.toBean(updateReqVO, EnterpriseUserBindDO.class);
+        // 效验邮箱是否被占用
+        EnterpriseUserBindDO emailUser = mapper.selectByEmail(updateObj.getEmail());
+        if (null != emailUser && !emailUser.getId().equals(userBindDO.getId())) {
+            throw exception(MDE_USER_EMAIL_EXISTS_OTHER);
+        }
         mapper.updateById(updateObj);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/fair/FairServiceImpl.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.service.fair;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -17,12 +18,14 @@ import com.citu.module.menduner.system.controller.app.recruit.job.vo.joinJobFair
 import com.citu.module.menduner.system.controller.base.fair.*;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseEntitlementDO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairDetailDO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairWhiteDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseEntitlementMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.fair.FairDetailMapper;
 import com.citu.module.menduner.system.dal.mysql.fair.FairMapper;
@@ -88,6 +91,9 @@ public class FairServiceImpl implements FairService {
     @Resource
     private JobAdvertisedService jobAdvertisedService;
 
+    @Resource
+    private EnterpriseEntitlementMapper entitlementMapper;
+
 
     @Override
     public Long createJobFair(JobFairSaveReqVO createReqVO) {
@@ -95,6 +101,15 @@ public class FairServiceImpl implements FairService {
         FairDO jobFair = BeanUtils.toBean(createReqVO, FairDO.class);
         fairMapper.insert(jobFair);
         // 返回
+        // 将权益允许加入招聘会的企业假如白名单
+        List<EnterpriseEntitlementDO> entitlementList = entitlementMapper.selectListByJobFairIsTrue();
+        List<Long> enterpriseIdList = entitlementList.stream()
+                .map(EnterpriseEntitlementDO::getEnterpriseId).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(enterpriseIdList)) {
+            // 加入白名单
+            addWhiteList(jobFair.getId(), enterpriseIdList);
+        }
+
         return jobFair.getId();
     }
 
@@ -166,9 +181,9 @@ public class FairServiceImpl implements FairService {
         EnterpriseDO enterpriseDO = enterpriseMapper.selectById(LoginUserContext.getEnterpriseId());
 //        FairWhiteDO fairWhiteDO = fairWhiteMapper
 //                .selectByJobFairIdAndEnterpriseId(jobFairId, LoginUserContext.getEnterpriseId());
-        List<FairWhiteDO> list = fairWhiteMapper
-                .selectByJobFairIdAndEnterpriseNameList(jobFairId, enterpriseDO.getName());
-        if (ObjectUtil.isEmpty(list)) {
+        FairWhiteDO white = fairWhiteMapper
+                .selectByJobFairIdAndEnterpriseId(jobFairId, enterpriseDO.getId());
+        if (null ==white) {
             throw exception(JOB_FAIR_NO_PERMISSION);
         }