1、优化方法命名

2、修改已知bug

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

@@ -205,6 +205,7 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_JOB_ADVERTISED_EDU_TYPE_NOT_NULL = new ErrorCode(1_200_010_007, "学历要求不能为空");
 
 
+
     // ========== 企业招聘者浏览 1_200_011_000 ==========
     ErrorCode ENTERPRISE_USER_LOOK_NOT_EXISTS = new ErrorCode(1_200_011_001, "企业招聘者浏览不存在");
 

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

@@ -1,9 +1,9 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise;
+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.appadmin.enterprise.vo.AppAdminEnterpriseRegisterReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRegisterRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,11 +15,11 @@ import javax.validation.Valid;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
-@Tag(name = "招聘端 - 企业注册申请")
+@Tag(name = "用户端 - 企业注册申请")
 @RestController
 @RequestMapping("/menduner/system/enterprise-register")
 @Validated
-public class AppAdminEnterpriseRegisterController {
+public class AppEnterpriseRegisterController {
 
     @Resource
     private EnterpriseRegisterService enterpriseRegisterService;
@@ -28,7 +28,7 @@ public class AppAdminEnterpriseRegisterController {
     @PreAuthenticated
     @PostMapping("/apply")
     @Operation(summary = "企业注册申请")
-    public CommonResult<Boolean> apply(@RequestBody @Valid AppAdminEnterpriseRegisterReqVO reqVO) {
+    public CommonResult<Boolean> apply(@RequestBody @Valid AppEnterpriseRegisterReqVO reqVO) {
         enterpriseRegisterService.apply(reqVO);
         return success(true);
     }
@@ -36,7 +36,7 @@ public class AppAdminEnterpriseRegisterController {
     @PreAuthenticated
     @GetMapping("/by/user")
     @Operation(summary = "获取当前用户提交的企业申请")
-    public CommonResult<AppAdminEnterpriseRegisterRespVO> getApplyByUserId() {
+    public CommonResult<AppEnterpriseRegisterRespVO> getApplyByUserId() {
         return success(enterpriseRegisterService.getApplyByUserId());
     }
 

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

@@ -1,9 +1,9 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise;
+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.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseUserApplyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,11 +15,11 @@ import javax.validation.Valid;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
-@Tag(name = "招聘端 - 企业用户申请")
+@Tag(name = "用户端 - 企业用户申请")
 @RestController
 @RequestMapping("/menduner/system/enterprise-user-apply")
 @Validated
-public class AppAdminEnterpriseUserApplyController {
+public class AppEnterpriseUserApplyController {
 
     @Resource
     private EnterpriseUserApplyService enterpriseUserApplyService;
@@ -27,7 +27,7 @@ public class AppAdminEnterpriseUserApplyController {
     @PreAuthenticated
     @PostMapping("/apply")
     @Operation(summary = "加入企业申请")
-    public CommonResult<Boolean> apply(@RequestBody @Valid AppAdminEnterpriseUserApplyReqVO reqVO) {
+    public CommonResult<Boolean> apply(@RequestBody @Valid AppEnterpriseUserApplyReqVO reqVO) {
         enterpriseUserApplyService.apply(reqVO);
         return success(true);
     }
@@ -35,7 +35,7 @@ public class AppAdminEnterpriseUserApplyController {
     @PreAuthenticated
     @GetMapping("/by/user")
     @Operation(summary = "获取申请加入信息")
-    public CommonResult<AppAdminEnterpriseUserApplyRespVO> getApplyByUserId() {
+    public CommonResult<AppEnterpriseUserApplyRespVO> getApplyByUserId() {
         return success(enterpriseUserApplyService.getApplyByUserId());
     }
 

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

@@ -0,0 +1,44 @@
+package com.citu.module.menduner.system.controller.app.enterprise;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
+import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户端 - 企业用户")
+@RestController
+@RequestMapping("/menduner/system/enterprise-user-bind")
+@Validated
+public class AppEnterpriseUserBindController {
+
+    @Resource
+    private EnterpriseUserBindService enterpriseUserBindService;
+
+
+    @GetMapping("/get/enterprise/list")
+    @Operation(summary = "获取当前用户绑定的企业列表")
+    public CommonResult<List<AppAdminEnterpriseUserBindRespVO>> getBindList() {
+        return success(enterpriseUserBindService.getBindList());
+    }
+
+    @GetMapping("/get/enterprise/list/by/phone")
+    @Operation(summary = "根据手机号获取用户绑定的企业列表")
+    public CommonResult<List<AppAdminEnterpriseUserBindRespVO>> getBindListByPhone
+            (@RequestParam("phone") String phone) {
+        return success(enterpriseUserBindService.getBindListByPhone(phone));
+
+    }
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/vo/AppAdminEnterpriseUserApplyReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/apply/AppEnterpriseUserApplyReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.apply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 
 @Schema(description = "menduner - 企业用户 Request VO")
 @Data
-public class AppAdminEnterpriseUserApplyReqVO {
+public class AppEnterpriseUserApplyReqVO {
 
 
     @Schema(description = "所属企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1420")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/vo/AppAdminEnterpriseUserApplyRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/apply/AppEnterpriseUserApplyRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.apply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "menduner - 企业用户 Response VO")
 @Data
-public class AppAdminEnterpriseUserApplyRespVO {
+public class AppEnterpriseUserApplyRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "32173")
     private Long id;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseUserLookPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/look/AppEnterpriseUserLookPageReqVO.java

@@ -1,15 +1,10 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.look;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "menduner - 企业招聘者浏览分页 Request VO")
 @Data

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseUserLookRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/look/AppEnterpriseUserLookRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.look;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/vo/AppAdminEnterpriseRegisterReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/register/AppEnterpriseRegisterReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.register;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank;
 
 @Schema(description = "menduner - 企业申请注册 Request VO")
 @Data
-public class AppAdminEnterpriseRegisterReqVO {
+public class AppEnterpriseRegisterReqVO {
 
     @NotBlank(message = "{1_200_006_004}")
     @Schema(description = "企业名称", example = "芋艿")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/vo/AppAdminEnterpriseRegisterRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/register/AppEnterpriseRegisterRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.enterprise.vo.register;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "menduner - 企业申请注册 Request VO")
 @Data
-public class AppAdminEnterpriseRegisterRespVO {
+public class AppEnterpriseRegisterRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9045")
     private Long id;
@@ -28,7 +28,7 @@ public class AppAdminEnterpriseRegisterRespVO {
     @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
     private String businessLicenseUrl;
 
-    @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态（0审核中 1审核通过 2审核不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private String status;
 
     @Schema(description = "审核原因", example = "不喜欢")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/AppJobAdvertisedController.java

@@ -34,22 +34,22 @@ public class AppJobAdvertisedController {
 
     @GetMapping("/get/recommended")
     @Operation(summary = "获取推荐招聘职位分页")
-    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getRecommendedJobPage(@Valid PageParam pageParam) {
-        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getRecommendedJobPage(pageParam);
+    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getRecommendedPage(@Valid PageParam pageParam) {
+        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getRecommendedPage(pageParam);
         return success(result);
     }
 
     @GetMapping("/get/latest")
     @Operation(summary = "获取最新招聘职位分页")
-    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getLatestJobPage(@Valid PageParam pageParam) {
-        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getLatestJobPage(pageParam);
+    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getLatestPage(@Valid PageParam pageParam) {
+        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getLatestPage(pageParam);
         return success(result);
     }
 
     @GetMapping("/get/urgent")
     @Operation(summary = "获取急聘招聘职位分页")
-    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getUrgentJobPage(@Valid PageParam pageParam) {
-        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getUrgentJobPage(pageParam);
+    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getUrgentPage(@Valid PageParam pageParam) {
+        PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedService.getUrgentPage(pageParam);
         return success(result);
     }
 
@@ -62,15 +62,15 @@ public class AppJobAdvertisedController {
 
     @GetMapping("/get/detail")
     @Operation(summary = "获取招聘职位详情")
-    public CommonResult<AppJobAdvertisedDetailRespVO> getJobAdvertisedDetail(@RequestParam("id") Long id) {
-        AppJobAdvertisedDetailRespVO respVO = jobAdvertisedService.getJobAdvertisedDetail(id);
+    public CommonResult<AppJobAdvertisedDetailRespVO> detail(@RequestParam("id") Long id) {
+        AppJobAdvertisedDetailRespVO respVO = jobAdvertisedService.detail(id);
         return success(respVO);
     }
 
     @GetMapping("/get/acquainted")
     @Operation(summary = "获取相识职位信息分页")
-    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> getJobAdvertisedDetail(@Valid AppJobAdvertisedPageReqVO pageReqVO) {
-        PageResult<AppJobAdvertisedHomeRespVO> respVO = jobAdvertisedService.getAcquaintedJobAdvertised(pageReqVO);
+    public CommonResult<PageResult<AppJobAdvertisedHomeRespVO>> detail(@Valid AppJobAdvertisedPageReqVO pageReqVO) {
+        PageResult<AppJobAdvertisedHomeRespVO> respVO = jobAdvertisedService.getAcquaintedPage(pageReqVO);
         return success(respVO);
     }
 

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

@@ -5,7 +5,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.admin.person.vo.record.PersonBrowseRecordRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserLookPageReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.look.AppEnterpriseUserLookPageReqVO;
 import com.citu.module.menduner.system.controller.app.person.vo.AppPersonBrowseRecordPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonBrowseRecordDO;
 import com.citu.module.menduner.system.service.enterprise.look.EnterpriseUserLookService;

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

@@ -260,8 +260,8 @@ public class AppPersonResumeController {
     @PreAuthenticated
     @GetMapping("/get/person/cv")
     @Operation(summary = "获取附件列表")
-    public CommonResult<List<AppCvAttachmentRespVO>> getCvAttachmentList() {
-        List<CvAttachmentDO> list = cvAttachmentService.getCvAttachmentList();
+    public CommonResult<List<AppCvAttachmentRespVO>> getList() {
+        List<CvAttachmentDO> list = cvAttachmentService.getList();
         return success(CvAttachmentConvert.INSTANCE.convertList(list));
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/auth/AppAdminEnterpriseAuthController.java

@@ -36,7 +36,7 @@ public class AppAdminEnterpriseAuthController {
     @PostMapping("/login")
     @Operation(summary = "企业-使用手机 + 密码登录")
     public CommonResult<AppMdeAuthLoginRespVO> login(@RequestBody @Valid AppEnterpriseAuthLoginReqVO reqVO) {
-        return success(enterpriseAuthService.loginEnterprise(reqVO));
+        return success(enterpriseAuthService.login(reqVO));
     }
 
     // ========== 短信登录相关 ==========
@@ -45,7 +45,7 @@ public class AppAdminEnterpriseAuthController {
     @PostMapping("/sms-login")
     @Operation(summary = "企业-使用手机 + 验证码登录")
     public CommonResult<AppMdeAuthLoginRespVO> smsLogin(@RequestBody @Valid AppEnterpriseAuthSmsLoginReqVO reqVO) {
-        return success(enterpriseAuthService.smsLoginEnterprise(reqVO));
+        return success(enterpriseAuthService.smsLogin(reqVO));
     }
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/AppAdminEnterpriseUserBindController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
@@ -26,18 +25,12 @@ public class AppAdminEnterpriseUserBindController {
     private EnterpriseUserBindService enterpriseUserBindService;
 
 
-    @GetMapping("/get/enterprise/list")
-    @Operation(summary = "获取当前用户绑定的企业列表")
-    public CommonResult<List<AppAdminEnterpriseUserBindRespVO>> getEnterpriseUserBindList() {
-        return success(enterpriseUserBindService.getEnterpriseUserBindList());
-    }
-
 
     @PreAuthenticated
     @GetMapping("/get/user")
     @Operation(summary = "获取当前登录的企业用户信息")
     public CommonResult<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBind() {
-        return success(enterpriseUserBindService.getEnterpriseUserBind());
+        return success(enterpriseUserBindService.getBindEnterprise());
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/job/vo/AppAdminJobAdvertisedReqVO.java

@@ -0,0 +1,70 @@
+package com.citu.module.menduner.system.controller.appadmin.job.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "管理后台 - 门墩儿-招聘职位新增/修改 Request VO")
+@Data
+public class AppAdminJobAdvertisedReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4770")
+    private Long id;
+
+    @Schema(description = "工作地区", requiredMode = Schema.RequiredMode.REQUIRED, example = "25976")
+    @NotNull(message = "{1_100_004_003}")
+    private Long areaId;
+
+    @Schema(description = "职位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "{1_200_010_003}")
+    private String name;
+
+    @Schema(description = "职位类型id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31707")
+    @NotNull(message = "{1_100_003_002}")
+    private Long positionId;
+
+    @Schema(description = "招聘类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotBlank(message = "{1_200_010_004}")
+    private String type;
+
+    @Schema(description = "工作经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotBlank(message = "{1_200_010_006}")
+    private String expType;
+
+    @Schema(description = "学历要求", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotBlank(message = "{1_200_010_007}")
+    private String eduType;
+
+    @Schema(description = "薪酬from")
+    private BigDecimal payFrom;
+
+    @Schema(description = "薪酬to")
+    private BigDecimal payTo;
+
+    @Schema(description = "薪酬单位")
+    private String payUnit;
+
+    @Schema(description = "职位标签")
+    private List<String> tagList;
+
+    @Schema(description = "职位内容")
+    private String content;
+
+    @Schema(description = "职位要求")
+    private String requirement;
+
+    @Schema(description = "工作地址")
+    private String address;
+
+    @Schema(description = "经度")
+    private String longitude;
+
+    @Schema(description = "维度")
+    private String latitude;
+
+}

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

@@ -2,7 +2,11 @@ package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.*;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.*;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.*;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import org.mapstruct.Mapper;
@@ -27,15 +31,15 @@ public interface EnterpriseConvert {
 
     AppEnterpriseSimpleRespVO convert5(ESJobAdvertisedMergeDO bean);
 
-    EnterpriseRegisterDO convert6(AppAdminEnterpriseRegisterReqVO bean);
+    EnterpriseRegisterDO convert6(AppEnterpriseRegisterReqVO bean);
 
     AppAdminEnterpriseUserBindRespVO convert7(EnterpriseUserBindDO bean);
 
-    AppAdminEnterpriseRegisterRespVO convert8(EnterpriseRegisterDO bean);
+    AppEnterpriseRegisterRespVO convert8(EnterpriseRegisterDO bean);
 
     List<AppEnterprisePostRespVO> convertList2(List<EnterprisePostDO> list);
 
-    AppAdminEnterpriseUserApplyRespVO convert9(EnterpriseUserApplyDO bean);
+    AppEnterpriseUserApplyRespVO convert9(EnterpriseUserApplyDO bean);
 
-    EnterpriseUserApplyDO convert10(AppAdminEnterpriseUserApplyReqVO bean);
+    EnterpriseUserApplyDO convert10(AppEnterpriseUserApplyReqVO bean);
 }

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

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.convert;
 
 import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedSimpleRespVO;
+import com.citu.module.menduner.system.controller.appadmin.job.vo.AppAdminJobAdvertisedReqVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import org.mapstruct.Mapper;
@@ -26,4 +27,6 @@ public interface JobAdvertisedConvert {
     List<ESJobAdvertisedMergeDO> convertList(List<JobAdvertisedDO> list);
 
     ESJobAdvertisedMergeDO convert2(JobAdvertisedDO bean);
+
+    JobAdvertisedDO convert3(AppAdminJobAdvertisedReqVO bean);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseRegisterDO.java

@@ -52,7 +52,7 @@ public class EnterpriseRegisterDO extends TenantBaseDO {
      */
     private String businessLicenseUrl;
     /**
-     * 帐号状态（0正常 1停用 2 等待审核 3不通过）
+     * 帐号状态（0审核中 1审核通过 2审核不通过）
      * <p>
      * 枚举 {@link TODO menduner_status 对应的类}
      */

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

@@ -55,6 +55,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus()));
     }
 
+
     default PageResult<AppJobAdvertisedHomeRespVO> selectPage(PageParam pageParam) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(JobAdvertisedDO.class);

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

@@ -20,7 +20,7 @@ public interface MdeEnterpriseAuthService {
      * @param reqVO 登录信息
      * @return 登录结果
      */
-    AppMdeAuthLoginRespVO loginEnterprise(@Valid AppEnterpriseAuthLoginReqVO reqVO);
+    AppMdeAuthLoginRespVO login(@Valid AppEnterpriseAuthLoginReqVO reqVO);
 
     /**
      * 手机 + 验证码登陆
@@ -28,7 +28,7 @@ public interface MdeEnterpriseAuthService {
      * @param reqVO 登陆信息
      * @return 登录结果
      */
-    AppMdeAuthLoginRespVO smsLoginEnterprise(@Valid AppEnterpriseAuthSmsLoginReqVO reqVO);
+    AppMdeAuthLoginRespVO smsLogin(@Valid AppEnterpriseAuthSmsLoginReqVO reqVO);
 
 
 }

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

@@ -97,7 +97,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
 
     @Override
     @DSTransactional
-    public AppMdeAuthLoginRespVO loginEnterprise(AppEnterpriseAuthLoginReqVO reqVO) {
+    public AppMdeAuthLoginRespVO login(AppEnterpriseAuthLoginReqVO reqVO) {
         // 校验验证码
         validateCaptcha(reqVO);
         // 使用手机 + 密码，进行登录。
@@ -116,7 +116,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
 
     @Override
     @DSTransactional
-    public AppMdeAuthLoginRespVO smsLoginEnterprise(AppEnterpriseAuthSmsLoginReqVO reqVO) {
+    public AppMdeAuthLoginRespVO smsLogin(AppEnterpriseAuthSmsLoginReqVO reqVO) {
         // 校验验证码
         String userIp = getClientIP();
 //        smsCodeApi.useSmsCode(MdeAuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MENDUNER_LOGIN.getScene(), userIp).setMobile(reqVO.getPhone())).getCheckedData();

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

@@ -65,5 +65,5 @@ public interface CvAttachmentService {
 
     void remove(Long id);
 
-    List<CvAttachmentDO> getCvAttachmentList();
+    List<CvAttachmentDO> getList();
 }

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

@@ -96,7 +96,7 @@ public class CvAttachmentServiceImpl implements CvAttachmentService {
     }
 
     @Override
-    public List<CvAttachmentDO> getCvAttachmentList() {
+    public List<CvAttachmentDO> getList() {
         Long userId = getLoginUserId();
         return cvAttachmentMapper.selectListByUserId(userId);
     }

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

@@ -68,17 +68,23 @@ public interface EnterpriseUserBindService {
      * @param userId 用户id
      * @param enterpriseId 企业id
      **/
-    AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId);
+    AppEnterpriseUserContactRespVO getContact(Long enterpriseId,Long userId);
 
     // ========== 招聘端 ==========
 
     /**
      * 获取当前用户绑定的企业列表
      **/
-    List<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBindList();
+    List<AppAdminEnterpriseUserBindRespVO> getBindList();
+
+    /**
+     * 根据手机号获取用户绑定的企业列表
+     **/
+    List<AppAdminEnterpriseUserBindRespVO> getBindListByPhone(String phone);
 
     /**
      * 获取当前登录用户绑定的企业
      **/
-    AppAdminEnterpriseUserBindRespVO getEnterpriseUserBind();
+    AppAdminEnterpriseUserBindRespVO getBindEnterprise();
+
 }

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

@@ -12,14 +12,17 @@ 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.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
+import com.citu.module.menduner.system.service.user.MdeUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -45,6 +48,8 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     @Resource
     private EnterpriseMapper enterpriseMapper;
 
+    @Resource
+    private MdeUserService mdeUserService;
     @Override
     public Long createEnterpriseUserBind(EnterpriseUserBindSaveReqVO createReqVO) {
         // 插入
@@ -93,7 +98,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     @Override
-    public AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId, Long userId) {
+    public AppEnterpriseUserContactRespVO getContact(Long enterpriseId, Long userId) {
         EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper.selectByEnterpriseIdAndUserId(enterpriseId, userId);
         if (null == userBindDO) {
             throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
@@ -114,10 +119,35 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     @Override
-    public List<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBindList() {
+    public List<AppAdminEnterpriseUserBindRespVO> getBindList() {
         List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
         if (null == list) {
-            return null;
+            return Collections.emptyList();
+        }
+        List<AppAdminEnterpriseUserBindRespVO> respList = new ArrayList<>();
+        for (EnterpriseUserBindDO userBindDO : list) {
+            AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
+            EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
+            if (null != enterprise) {
+                resp.setEnterpriseId(enterprise.getId());
+                resp.setEnterpriseName(enterprise.getName());
+            }
+            respList.add(resp);
+        }
+        return respList;
+    }
+
+    @Override
+    public List<AppAdminEnterpriseUserBindRespVO> getBindListByPhone(String phone) {
+        MdeUserDO user = mdeUserService.getUserByPhone(phone);
+        if(null == user) {
+            // 返回空列表,方便前端跳注册申请页面
+            return Collections.emptyList();
+        }
+        // 获取用户绑定企业信息
+        List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(user.getId());
+        if (null == list) {
+            return Collections.emptyList();
         }
         List<AppAdminEnterpriseUserBindRespVO> respList = new ArrayList<>();
         for (EnterpriseUserBindDO userBindDO : list) {
@@ -133,10 +163,10 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     @Override
-    public AppAdminEnterpriseUserBindRespVO getEnterpriseUserBind() {
+    public AppAdminEnterpriseUserBindRespVO getBindEnterprise() {
         LoginUser loginUser = getLoginUser();
         if (null != loginUser
-                && loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
+                && !loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
             throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
         }
         EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper

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

@@ -5,8 +5,8 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRegisterReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRegisterRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
 
 import javax.validation.Valid;
@@ -74,10 +74,10 @@ public interface EnterpriseRegisterService {
      * 企业注册申请
      * @param reqVO
      **/
-    void apply(AppAdminEnterpriseRegisterReqVO reqVO);
+    void apply(AppEnterpriseRegisterReqVO reqVO);
 
     /**
      * 获取用户提交的申请
      **/
-    AppAdminEnterpriseRegisterRespVO getApplyByUserId();
+    AppEnterpriseRegisterRespVO getApplyByUserId();
 }

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

@@ -7,8 +7,8 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.register.EnterpriseRegisterSaveReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRegisterReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRegisterRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
@@ -156,7 +156,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
 
     @Override
     @DSTransactional
-    public void apply(AppAdminEnterpriseRegisterReqVO reqVO) {
+    public void apply(AppEnterpriseRegisterReqVO reqVO) {
         if (enterpriseRegisterMapper.selectCountByUserIdAndStatus( getLoginUserId(),
                 EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()) > 0) {
             // 存在审批中的申请
@@ -169,7 +169,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
     }
 
     @Override
-    public AppAdminEnterpriseRegisterRespVO getApplyByUserId() {
+    public AppEnterpriseRegisterRespVO getApplyByUserId() {
         return EnterpriseConvert.INSTANCE.convert8(enterpriseRegisterMapper.selectByUserId(getLoginUserId()));
     }
 }

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

@@ -4,8 +4,8 @@ import com.citu.framework.common.pojo.PageResult;
 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.vo.EnterpriseUserApplySaveReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserApplyDO;
 
 import javax.validation.Valid;
@@ -76,11 +76,11 @@ public interface EnterpriseUserApplyService {
      *
      * @param reqVO
      **/
-    void apply(AppAdminEnterpriseUserApplyReqVO reqVO);
+    void apply(AppEnterpriseUserApplyReqVO reqVO);
 
     /**
      * 获取用户提交的申请
      **/
-    AppAdminEnterpriseUserApplyRespVO getApplyByUserId();
+    AppEnterpriseUserApplyRespVO getApplyByUserId();
 
 }

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

@@ -6,8 +6,8 @@ import com.citu.framework.common.util.object.BeanUtils;
 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.vo.EnterpriseUserApplySaveReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserApplyDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -147,7 +147,7 @@ public class EnterpriseUserApplyServiceImpl implements EnterpriseUserApplyServic
 
     @Override
     @DSTransactional
-    public void apply(AppAdminEnterpriseUserApplyReqVO reqVO) {
+    public void apply(AppEnterpriseUserApplyReqVO reqVO) {
         if (enterpriseUserApplyMapper
                 .selectCountByUserIdAndStatus(getLoginUserId(),
                         EnterpriseUserApplyAuditStatusEnum.AUDITING.getStatus()) > 0) {
@@ -160,7 +160,7 @@ public class EnterpriseUserApplyServiceImpl implements EnterpriseUserApplyServic
     }
 
     @Override
-    public AppAdminEnterpriseUserApplyRespVO getApplyByUserId() {
+    public AppEnterpriseUserApplyRespVO getApplyByUserId() {
         return EnterpriseConvert.INSTANCE.convert9(enterpriseUserApplyMapper.selectByUserId(getLoginUserId()));
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedService.java

@@ -7,6 +7,7 @@ import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedPage
 import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedSaveReqVO;
 import com.citu.module.menduner.system.controller.app.appbase.AppCommonRespVO;
 import com.citu.module.menduner.system.controller.app.job.vo.*;
+import com.citu.module.menduner.system.controller.appadmin.job.vo.AppAdminJobAdvertisedReqVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 
 import javax.validation.Valid;
@@ -63,7 +64,7 @@ public interface JobAdvertisedService {
      * @param pageParam 分页
      * @return 门墩儿-招聘职位分页
      **/
-    PageResult<AppJobAdvertisedHomeRespVO> getRecommendedJobPage(PageParam pageParam);
+    PageResult<AppJobAdvertisedHomeRespVO> getRecommendedPage(PageParam pageParam);
 
     /**
      * 获取最新招聘职位分页
@@ -71,7 +72,7 @@ public interface JobAdvertisedService {
      * @param pageParam 分页
      * @return 门墩儿-招聘职位分页
      **/
-    PageResult<AppJobAdvertisedHomeRespVO> getLatestJobPage(PageParam pageParam);
+    PageResult<AppJobAdvertisedHomeRespVO> getLatestPage(PageParam pageParam);
 
     /**
      * 获取急聘招聘职位分页
@@ -79,7 +80,7 @@ public interface JobAdvertisedService {
      * @param pageParam 分页
      * @return 门墩儿-招聘职位分页
      **/
-    PageResult<AppJobAdvertisedHomeRespVO> getUrgentJobPage(PageParam pageParam);
+    PageResult<AppJobAdvertisedHomeRespVO> getUrgentPage(PageParam pageParam);
 
     /**
      * 获取热门企业的职位分页
@@ -95,14 +96,14 @@ public interface JobAdvertisedService {
      * @param id 职位id
      * @return 门墩儿-招聘职位详情
      **/
-    AppJobAdvertisedDetailRespVO getJobAdvertisedDetail(Long id);
+    AppJobAdvertisedDetailRespVO detail(Long id);
 
     /**
      * 获取相识职位信息
      *
      * @return 门墩儿-招聘职位简易列表
      **/
-    PageResult<AppJobAdvertisedHomeRespVO> getAcquaintedJobAdvertised(AppJobAdvertisedPageReqVO pageReqVO);
+    PageResult<AppJobAdvertisedHomeRespVO> getAcquaintedPage(AppJobAdvertisedPageReqVO pageReqVO);
 
     /**
      * 根据条件搜索职位
@@ -122,4 +123,10 @@ public interface JobAdvertisedService {
      **/
     List<AppCommonRespVO> getJobAreaCountByEnterpriseId(Long enterpriseId);
 
+    /**
+     * 保存职位
+     * @return 公共 Response
+     **/
+    boolean save(AppAdminJobAdvertisedReqVO reqVO);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -2,20 +2,25 @@ package com.citu.module.menduner.system.service.job;
 
 
 import cn.hutool.core.collection.ListUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 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.security.core.LoginUser;
 import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedPageReqVO;
 import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedSaveReqVO;
 import com.citu.module.menduner.system.controller.app.appbase.AppCommonRespVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
 import com.citu.module.menduner.system.controller.app.job.vo.*;
+import com.citu.module.menduner.system.controller.appadmin.job.vo.AppAdminJobAdvertisedReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.util.EsQueryBuildUtils;
@@ -35,9 +40,13 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static com.citu.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.framework.security.core.LoginUser.INFO_KEY_DATA_ID;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
 
 /**
@@ -282,22 +291,22 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     }
 
     @Override
-    public PageResult<AppJobAdvertisedHomeRespVO> getRecommendedJobPage(PageParam pageParam) {
+    public PageResult<AppJobAdvertisedHomeRespVO> getRecommendedPage(PageParam pageParam) {
         return jobAdvertisedMapper.selectPage(pageParam);
     }
 
     @Override
-    public PageResult<AppJobAdvertisedHomeRespVO> getLatestJobPage(PageParam pageParam) {
+    public PageResult<AppJobAdvertisedHomeRespVO> getLatestPage(PageParam pageParam) {
         return jobAdvertisedMapper.selectPage(pageParam);
     }
 
     @Override
-    public PageResult<AppJobAdvertisedHomeRespVO> getUrgentJobPage(PageParam pageParam) {
+    public PageResult<AppJobAdvertisedHomeRespVO> getUrgentPage(PageParam pageParam) {
         return jobAdvertisedMapper.selectPage(pageParam);
     }
 
     @Override
-    public PageResult<AppJobAdvertisedHomeRespVO> getAcquaintedJobAdvertised(AppJobAdvertisedPageReqVO pageReqVO) {
+    public PageResult<AppJobAdvertisedHomeRespVO> getAcquaintedPage(AppJobAdvertisedPageReqVO pageReqVO) {
         return jobAdvertisedMapper.selectPage(pageReqVO);
     }
 
@@ -320,7 +329,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
 
     @Override
-    public AppJobAdvertisedDetailRespVO getJobAdvertisedDetail(Long id) {
+    public AppJobAdvertisedDetailRespVO detail(Long id) {
         JobAdvertisedDO job = jobAdvertisedMapper.selectById(id);
         if (null == job) {
             throw exception(MDE_JOB_ADVERTISED_NOT_EXISTS);
@@ -337,7 +346,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
         // 查询联系人信息
         AppEnterpriseUserContactRespVO contactRespVO = userBindService.
-                getEnterpriseUserContact(enterprise.getId(), respVO.getUserId());
+                getContact(enterprise.getId(), respVO.getUserId());
         respVO.setContact(contactRespVO);
         return respVO;
     }
@@ -377,12 +386,12 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     }
 
     /**
+     * @param list   目标对象
+     * @param search 搜索结果
+     * @return void
      * @description 填充搜索结果
      * @author rayson
-     * @param list 目标对象
-     * @param search 搜索结果
      * @date 2024/6/4 下午2:40
-     * @return void
      **/
     private void fill(List<AppJobAdvertisedRespVO> list, SearchHits<ESJobAdvertisedMergeDO> search) {
         search.getSearchHits().stream()
@@ -404,7 +413,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
                     // 获取职位发布人
                     AppEnterpriseUserContactRespVO contactRespVO = userBindService
-                            .getEnterpriseUserContact(searchHit.getContent().getEnterpriseId(), searchHit.getContent().getUserId());
+                            .getContact(searchHit.getContent().getEnterpriseId(), searchHit.getContent().getUserId());
                     // 设置联系人
                     respVO.setContact(contactRespVO);
                     list.add(respVO);
@@ -452,5 +461,40 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         return list;
     }
 
+    @Override
+    @DSTransactional
+    public boolean save(AppAdminJobAdvertisedReqVO reqVO) {
+        LoginUser user = getLoginUser();
+        if (null == user || !user.getInfo().containsKey(INFO_KEY_DATA_ID)) {
+            // 没权限
+            throw exception(FORBIDDEN);
+        }
+        JobAdvertisedDO job = JobAdvertisedConvert.INSTANCE.convert3(reqVO);
+        if (null == reqVO.getId()) {
+            // 新增
+
+            job.setUserId(user.getId());
 
+            Long enterpriseId = Long.valueOf(user.getInfo().get(INFO_KEY_DATA_ID));
+            job.setEnterpriseId(enterpriseId);
+            job.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+
+            jobAdvertisedMapper.insert(job);
+
+        } else {
+            // 修改
+            JobAdvertisedDO entity = jobAdvertisedMapper.selectById(reqVO.getId());
+
+            if (!Objects.equals(user.getId(), entity.getUserId())
+                    || !Objects.equals(user.getId(), entity.getEnterpriseId())) {
+                // 不是自己的数据
+                throw exception(FORBIDDEN);
+            }
+            job.setId(entity.getId());
+            jobAdvertisedMapper.updateById(job);
+
+
+        }
+        return true;
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -96,7 +96,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
         for (AppJobAdvertisedRespVO respVO : result.getList()) {
             // 获取职位发布人
             AppEnterpriseUserContactRespVO contactRespVO = userBindService
-                    .getEnterpriseUserContact(respVO.getEnterprise().getId(), respVO.getJob().getUserId());
+                    .getContact(respVO.getEnterprise().getId(), respVO.getJob().getUserId());
             // 设置联系人
             respVO.setContact(contactRespVO);
         }

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

@@ -223,6 +223,10 @@ public class MdePermissionServiceImpl implements MdePermissionService {
 
         // 获得用户的部门编号的缓存，通过 Guava 的 Suppliers 惰性求值，即有且仅有第一次发起 DB 的查询
         EnterpriseUserBindDO enterpriseUserBind =   enterpriseUserBindService.getEnterpriseUserBindById(userId);
+        if (enterpriseUserBind == null) {
+            // 找不到企业用户 or 禁用了
+            return result;
+        }
         // 遍历每个角色，计算
         for (MdeRoleDO role : roles) {
             // 为空时，跳过