1、增加企业信息修改接口

2、增加企业营业执照信息修改接口

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

@@ -182,9 +182,19 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ENTERPRISE_CODE_NOT_NULL = new ErrorCode(1_200_004_002, "企业编码不能为空");
     ErrorCode MDE_ENTERPRISE_NAME_NOT_NULL = new ErrorCode(1_200_004_003, "未填写企业名称");
 
+    ErrorCode MDE_ENTERPRISE_ANOTHER_NAME_NOT_NULL = new ErrorCode(1_200_004_004, "未填写企业别称");
+    ErrorCode MDE_ENTERPRISE_INTRODUCE_NOT_NULL = new ErrorCode(1_200_004_005, "未填写公司简介");
+    ErrorCode MDE_ENTERPRISE_INDUSTRY_NOT_NULL = new ErrorCode(1_200_004_006, "未选择所在行业");
+    ErrorCode MDE_ENTERPRISE_FINANCING_STATUS_NOT_NULL = new ErrorCode(1_200_004_007, "未选择融资阶段");
+    ErrorCode MDE_ENTERPRISE_SCALE_NOT_NULL = new ErrorCode(1_200_004_008, "未选择人员规模");
+    ErrorCode MDE_ENTERPRISE_WORK_TIME_NOT_NULL = new ErrorCode(1_200_004_009, "未填写上班时间");
+
     // ========== 企业工商信息  1_200_005_001 ==========
     ErrorCode MDE_ENTERPRISE_BUSINESS_NOT_EXISTS = new ErrorCode(1_200_005_001, "企业工商信息不存在");
 
+    ErrorCode MDE_ENTERPRISE_BUSINESS_NAME_NOT_NULL = new ErrorCode(1_200_005_002, "未填写企业名称");
+    ErrorCode MDE_ENTERPRISE_BUSINESS_CODE_NOT_NULL = new ErrorCode(1_200_005_003, "未填写统一社会信用代码");
+
     // ========== 企业注册申请 1_200_006_000 ==========
     ErrorCode MDE_ENTERPRISE_REGISTER_NOT_EXISTS = new ErrorCode(1_200_006_001, "企业注册申请不存在");
     ErrorCode MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED =

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRule.java

@@ -14,6 +14,7 @@ import com.citu.framework.mybatis.core.util.MyBatisUtils;
 import com.citu.framework.security.core.LoginUser;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.menduner.system.api.permission.MendunerPermissionApi;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import com.citu.module.system.api.permission.dto.DataPermissionRespDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import static com.citu.module.menduner.system.util.LoginUserContext.checkEnterprise;
+
 /**
  * @author Rayson
  * @description CustomDataPermissionRule
@@ -84,8 +87,7 @@ public class CustomDataPermissionRule implements DataPermissionRule {
             return null;
         }
 
-        if (CollUtil.isEmpty(loginUser.getInfo())
-                || !loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
+        if (!checkEnterprise(loginUser)) {
             // 没有企业id
             return null;
         }
@@ -93,7 +95,7 @@ public class CustomDataPermissionRule implements DataPermissionRule {
         DataPermissionRespDTO dataPermission = loginUser.getContext(CONTEXT_KEY, DataPermissionRespDTO.class);
         // 从上下文中拿不到，则调用逻辑进行获取
         if (dataPermission == null) {
-            Long enterpriseId = Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID));
+            Long enterpriseId = LoginUserContext.getEnterpriseId(loginUser);
             dataPermission = permissionApi.getDataPermission(loginUser.getId(), enterpriseId).getCheckedData();
             if (dataPermission == null) {
                 log.error("[getExpression][LoginUser({}) 获取数据权限为 null]", JsonUtils.toJsonString(loginUser));

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

@@ -4,11 +4,11 @@ import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.config.SecurityProperties;
-import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.menduner.system.controller.app.auth.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.service.auth.MdeAuthService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
@@ -24,10 +24,7 @@ import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import java.util.Objects;
-
 import static com.citu.framework.common.pojo.CommonResult.success;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "求职端 - 用户登录")
 @RestController
@@ -82,14 +79,14 @@ public class AppMdeAuthController {
     @PostMapping("/send-sms-code")
     @Operation(summary = "发送手机验证码")
     public CommonResult<Boolean> sendSmsCode(@RequestBody @Valid AppMdeAuthSmsSendReqVO reqVO) {
-        authService.sendSmsCode(getLoginUserId(), reqVO);
+        authService.sendSmsCode(LoginUserContext.getUserId(), reqVO);
         return success(true);
     }
 
     @PostMapping("/validate-sms-code")
     @Operation(summary = "校验手机验证码")
     public CommonResult<Boolean> validateSmsCode(@RequestBody @Valid AppMdeAuthSmsValidateReqVO reqVO) {
-        authService.validateSmsCode(getLoginUserId(), reqVO);
+        authService.validateSmsCode(LoginUserContext.getUserId(), reqVO);
         return success(true);
     }
 

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

@@ -7,6 +7,7 @@ import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.app.user.vo.*;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.service.user.MdeUserService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,7 +18,6 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "求职端 - 用户信息")
 @RestController
@@ -41,7 +41,7 @@ public class AppMdeUserController {
     @Operation(summary = "修改用户手机")
     @PreAuthenticated
     public CommonResult<Boolean> updateUserPhone(@RequestBody @Valid AppMdeUserUpdatePhoneReqVO reqVO) {
-        mdeUserService.updateUserPhone(getLoginUserId(), reqVO);
+        mdeUserService.updateUserPhone(LoginUserContext.getUserId(), reqVO);
         return success(true);
     }
 
@@ -49,7 +49,7 @@ public class AppMdeUserController {
     @Operation(summary = "基于微信小程序的授权码，修改用户手机")
     @PreAuthenticated
     public CommonResult<Boolean> updateUserMobileByWeixin(@RequestBody @Valid AppMdeUserUpdatePhoneByWeixinReqVO reqVO) {
-        mdeUserService.updateUserMobileByWeixin(getLoginUserId(), reqVO);
+        mdeUserService.updateUserMobileByWeixin(LoginUserContext.getUserId(), reqVO);
         return success(true);
     }
 
@@ -57,7 +57,7 @@ public class AppMdeUserController {
     @Operation(summary = "修改用户密码", description = "用户修改密码时使用")
     @PreAuthenticated
     public CommonResult<Boolean> updateUserPassword(@RequestBody @Valid AppMdeUserUpdatePasswordReqVO reqVO) {
-        mdeUserService.updateUserPassword(getLoginUserId(), reqVO);
+        mdeUserService.updateUserPassword(LoginUserContext.getUserId(), reqVO);
         return success(true);
     }
 
@@ -69,6 +69,4 @@ public class AppMdeUserController {
     }
 
 
-
-
 }

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

@@ -0,0 +1,92 @@
+package com.citu.module.menduner.system.controller.appadmin.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.*;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
+import com.citu.module.menduner.system.service.enterprise.business.EnterpriseBusinessService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "招聘端 - 企业信息")
+@RestController
+@RequestMapping("/menduner/system/enterprise")
+@Validated
+@Slf4j
+public class AppAdminEnterpriseController {
+
+    @Resource
+    private EnterpriseService enterpriseService;
+
+    @Resource
+    private EnterpriseBusinessService enterpriseBusinessService;
+
+
+    @PreAuthenticated
+    @PostMapping("/logo/update")
+    @Operation(summary = "修改企业logo")
+    public CommonResult<Boolean> uploadLogo(@RequestParam("logoUrl") String logoUrl) {
+        enterpriseService.uploadLogo(logoUrl);
+        return success(true);
+    }
+
+    @PreAuthenticated
+    @PostMapping("/album/update")
+    @Operation(summary = "修改企业相册")
+    public CommonResult<Boolean> uploadAlbum(
+            @Valid @RequestBody AppAdminEnterpriseAlbumReqVO reqVO) {
+        enterpriseService.uploadAlbum(reqVO);
+        return success(true);
+    }
+
+    @PreAuthenticated
+    @PostMapping("/welfare/update")
+    @Operation(summary = "修改企业福利标签")
+    public CommonResult<Boolean> uploadWelfare(
+            @Valid @RequestBody AppAdminEnterpriseWelfareReqVO reqVO) {
+        enterpriseService.uploadWelfare(reqVO);
+        return success(true);
+    }
+
+
+    @PreAuthenticated
+    @PostMapping("/update")
+    @Operation(summary = "修改企业基本信息")
+    public CommonResult<Boolean> update(
+            @Valid @RequestBody AppAdminEnterpriseSaveReqVO reqVO) {
+        enterpriseService.update(reqVO);
+        return success(true);
+    }
+
+    @PreAuthenticated
+    @GetMapping("/get")
+    @Operation(summary = "获取企业基本信息")
+    public CommonResult<AppAdminEnterpriseRespVO> get() {
+        return CommonResult.success(enterpriseService.get());
+    }
+
+    @PreAuthenticated
+    @PostMapping("/business/update")
+    @Operation(summary = "修改企业营业执照信息")
+    public CommonResult<Boolean> update(
+            @Valid @RequestBody AppAdminEnterpriseBusinessSaveReqVO reqVO) {
+        enterpriseBusinessService.update(reqVO);
+        return success(true);
+    }
+
+    @PreAuthenticated
+    @GetMapping("/business/get")
+    @Operation(summary = "获取企业营业执照信息")
+    public CommonResult<AppAdminEnterpriseBusinessRespVO> getBusiness() {
+        return CommonResult.success(enterpriseBusinessService.get());
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostPageReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostSaveReqVO;
+import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "招聘端 - 企业岗位信息")
+@RestController
+@RequestMapping("/menduner/system/enterprise-post")
+@Validated
+public class AppAdminEnterprisePostController {
+
+    @Resource
+    private EnterprisePostService enterprisePostService;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增")
+    @PreAuthenticated
+    public CommonResult<Long> create(
+            @Valid @RequestBody AppAdminEnterprisePostSaveReqVO createReqVO) {
+        return success(enterprisePostService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新")
+    @PreAuthenticated
+    public CommonResult<Boolean> update(
+            @Valid @RequestBody AppAdminEnterprisePostSaveReqVO updateReqVO) {
+        enterprisePostService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthenticated
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        enterprisePostService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthenticated
+    public CommonResult<AppAdminEnterprisePostRespVO> get(@RequestParam("id") Long id) {
+        return success(enterprisePostService.get(id));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得分页")
+    @PreAuthenticated
+    public CommonResult<PageResult<AppAdminEnterprisePostRespVO>> page(
+            @Valid AppAdminEnterprisePostPageReqVO pageReqVO) {
+        return success(enterprisePostService.page(pageReqVO));
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.post;
+
+import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostPageReqVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "menduner -  企业岗位信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AppAdminEnterprisePostPageReqVO extends EnterprisePostPageReqVO {
+
+}

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

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.post;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 企业岗位信息 Response VO")
+@Data
+public class AppAdminEnterprisePostRespVO {
+
+    @Schema(description = "岗位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13815")
+    private Long id;
+
+    @Schema(description = "岗位缩写")
+    private String code;
+
+    @Schema(description = "岗位中文名称")
+    private String nameCn;
+
+    @Schema(description = "岗位英文")
+    private String nameEn;
+
+    @Schema(description = "显示顺序")
+    private Integer sort;
+
+    @Schema(description = "状态（0正常 1停用）", example = "2")
+    private String status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.post;
+
+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;
+
+@Schema(description = "企业岗位信息新增/修改 Request VO")
+@Data
+public class AppAdminEnterprisePostSaveReqVO {
+
+    @Schema(description = "岗位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13815")
+    private Long id;
+
+    @Schema(description = "岗位缩写")
+    private String code;
+
+    @Schema(description = "岗位中文名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "{1_200_009_002}")
+    private String nameCn;
+
+    @Schema(description = "岗位英文", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "{1_200_009_003}")
+    private String nameEn;
+
+    @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{1_200_000_003}")
+    private Integer sort;
+
+    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotBlank(message = "{1_200_000_001}")
+    private String status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+}

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

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "menduner - 企业相册 Request VO")
+@Data
+public class AppAdminEnterpriseAlbumReqVO {
+
+    @Schema(description = "公司相册")
+    private List<String> albumList;
+
+}

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

@@ -0,0 +1,61 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 企业工商信息 Response VO")
+@Data
+public class AppAdminEnterpriseBusinessRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8156")
+    private Long id;
+
+    @Schema(description = "统一社会信用代码")
+    private String code;
+
+    @Schema(description = "企业名称", example = "李四")
+    private String name;
+
+    @Schema(description = "企业类型", example = "2")
+    private String type;
+
+    @Schema(description = "所属地区")
+    private String area;
+
+    @Schema(description = "注册地址")
+    private String address;
+
+    @Schema(description = "法定代表人")
+    private String representative;
+
+    @Schema(description = "成立时间")
+    private LocalDateTime establishmentTime;
+
+    @Schema(description = "注册资金")
+    private String registeredCapital;
+
+    @Schema(description = "核准日期")
+    private String approvalTime;
+
+    @Schema(description = "曾用名")
+    private String formerName;
+
+    @Schema(description = "所属行业")
+    private String industry;
+
+    @Schema(description = "注册机关")
+    private String registrationAuthority;
+
+    @Schema(description = "经营状态", example = "1")
+    private String businessStatus;
+
+    @Schema(description = "营业期限")
+    private String businessTerm;
+
+    @Schema(description = "经营范围")
+    private String businessScope;
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "menduner - 企业工商信息新增/修改 Request VO")
+@Data
+public class AppAdminEnterpriseBusinessSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8156")
+    private Long id;
+
+    @NotBlank(message = "{1_200_005_003}")
+    @Schema(description = "统一社会信用代码")
+    private String code;
+
+    @NotBlank(message = "{1_200_005_002}")
+    @Schema(description = "企业名称", example = "李四")
+    private String name;
+
+    @Schema(description = "企业类型", example = "2")
+    private String type;
+
+    @Schema(description = "所属地区")
+    private String area;
+
+    @Schema(description = "注册地址")
+    private String address;
+
+    @Schema(description = "法定代表人")
+    private String representative;
+
+    @Schema(description = "成立时间")
+    private LocalDateTime establishmentTime;
+
+    @Schema(description = "注册资金")
+    private String registeredCapital;
+
+    @Schema(description = "核准日期")
+    private String approvalTime;
+
+    @Schema(description = "曾用名", example = "芋艿")
+    private String formerName;
+
+    @Schema(description = "所属行业")
+    private String industry;
+
+    @Schema(description = "注册机关")
+    private String registrationAuthority;
+
+    @Schema(description = "经营状态", example = "1")
+    private String businessStatus;
+
+    @Schema(description = "营业期限")
+    private String businessTerm;
+
+    @Schema(description = "经营范围")
+    private String businessScope;
+
+}

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

@@ -0,0 +1,61 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "menduner - 企业信息 Response VO")
+@Data
+public class AppAdminEnterpriseRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20137")
+    private Long id;
+
+    @Schema(description = "企业全称", example = "广州xx科技")
+    private String name;
+
+    @Schema(description = "企业别称", example = "xx科技")
+    private String anotherName;
+
+    @Schema(description = "企业官网")
+    private String website;
+
+    @Schema(description = "公司简介")
+    private String introduce;
+
+    @Schema(description = "联系人")
+    private String contact;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @Schema(description = "logo图片地址", example = "https://www.iocoder.cn")
+    private String logoUrl;
+
+    @Schema(description = "所在行业", example = "16657")
+    private Long industryId;
+
+    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "2")
+    private String financingStatus;
+
+    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）")
+    private String scale;
+
+    @Schema(description = "公司福利")
+    private List<String> welfareList;
+
+    @Schema(description = "公司相册")
+    private List<String> albumList;
+
+    @Schema(description = "上班时间")
+    private String workTime;
+
+    @Schema(description = "发展历程")
+    private String developHistory;
+
+    @Schema(description = "获得荣誉")
+    private String receivedHonors;
+
+
+}

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

@@ -0,0 +1,60 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Schema(description = "menduner - 企业信息新增/修改 Request VO")
+@Data
+public class AppAdminEnterpriseSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20137")
+    private Long id;
+
+    @NotBlank(message = "{1_200_004_003}")
+    @Schema(description = "企业全称", example = "广州xx科技")
+    private String name;
+
+    @NotBlank(message = "{1_200_004_004}")
+    @Schema(description = "企业别称", example = "xx科技")
+    private String anotherName;
+
+    @Schema(description = "企业官网")
+    private String website;
+
+    @NotBlank(message = "{1_200_004_005}")
+    @Schema(description = "公司简介")
+    private String introduce;
+
+    @Schema(description = "联系人")
+    private String contact;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @NotNull(message = "{1_200_004_006}")
+    @Schema(description = "所在行业", example = "16657")
+    private Long industryId;
+
+    @NotBlank(message = "{1_200_004_007}")
+    @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "2")
+    private String financingStatus;
+
+    @NotBlank(message = "{1_200_004_008}")
+    @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）")
+    private String scale;
+
+    @NotBlank(message = "{1_200_004_009}")
+    @Schema(description = "上班时间")
+    private String workTime;
+
+    @Schema(description = "发展历程")
+    private String developHistory;
+
+    @Schema(description = "获得荣誉")
+    private String receivedHonors;
+
+}

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

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "menduner - 企业福利标签 Request VO")
+@Data
+public class AppAdminEnterpriseWelfareReqVO {
+
+    @Schema(description = "公司福利")
+    private List<String> welfareList;
+
+}

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

@@ -1,12 +1,16 @@
 package com.citu.module.menduner.system.convert;
 
-import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.app.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.AppAdminEnterpriseBusinessRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessSaveReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
+import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.*;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import org.mapstruct.Mapper;
@@ -41,7 +45,15 @@ public interface EnterpriseConvert {
 
     AppEnterpriseUserApplyRespVO convert9(EnterpriseUserApplyDO bean);
 
-    EnterpriseUserApplyDO convert10(AppEnterpriseUserApplyReqVO bean);
+    EnterpriseUserApplyDO convert10(AppEnterpriseUserApplyReqVO reqVO);
 
     AppEnterpriseUserBindRespVO convert11(EnterpriseUserBindDO bean);
+
+    EnterpriseDO convert12(AppAdminEnterpriseSaveReqVO reqVO);
+
+    AppAdminEnterpriseRespVO convert13(EnterpriseDO bean);
+
+    EnterpriseBusinessDO convert14(AppAdminEnterpriseBusinessSaveReqVO reqVO);
+
+    AppAdminEnterpriseBusinessRespVO convert15(EnterpriseBusinessDO bean);
 }

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

@@ -0,0 +1,18 @@
+package com.citu.module.menduner.system.convert;
+
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface EnterprisePostConvert {
+
+
+    EnterprisePostConvert INSTANCE = Mappers.getMapper(EnterprisePostConvert.class);
+
+    EnterprisePostDO convert(AppAdminEnterprisePostSaveReqVO bean);
+
+    AppAdminEnterprisePostRespVO convert2(EnterprisePostDO bean);
+}

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

@@ -3,6 +3,8 @@ 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.appadmin.enterprise.post.AppAdminEnterprisePostRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
@@ -35,4 +37,17 @@ public interface EnterprisePostMapper extends BaseMapperX<EnterprisePostDO> {
                 .eqIfPresent(EnterprisePostDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
         );
     }
+
+    default PageResult<AppAdminEnterprisePostRespVO> page(EnterprisePostPageReqVO reqVO) {
+        return selectJoinPage(reqVO, AppAdminEnterprisePostRespVO.class,
+                new MPJLambdaWrapperX<EnterprisePostDO>()
+                        .selectAll(EnterprisePostDO.class)
+                        .eqIfPresent(EnterprisePostDO::getEnterpriseId, reqVO.getEnterpriseId())
+                        .eqIfPresent(EnterprisePostDO::getCode, reqVO.getCode())
+                        .likeIfPresent(EnterprisePostDO::getNameCn, reqVO.getNameCn())
+                        .likeIfPresent(EnterprisePostDO::getNameEn, reqVO.getNameEn())
+                        .eqIfPresent(EnterprisePostDO::getStatus, reqVO.getStatus())
+                        .betweenIfPresent(EnterprisePostDO::getCreateTime, reqVO.getCreateTime())
+                        .orderByDesc(EnterprisePostDO::getSort, EnterprisePostDO::getUpdateTime));
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/framework/datapermission/config/DataPermissionConfiguration.java

@@ -2,10 +2,9 @@ package com.citu.module.menduner.system.framework.datapermission.config;
 
 
 import com.citu.module.menduner.system.config.permission.CustomDataPermissionRuleCustomizer;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
-import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -34,6 +33,9 @@ public class DataPermissionConfiguration {
             // 简历投递表 where publish_user_id = xx and enterprise_id = xx
             rule.addUserColumn(JobCvRelDO.class, "publish_user_id");
             rule.addDataColumn(JobCvRelDO.class, "enterprise_id");
+
+            // 企业岗位表 where  enterprise_id = xx
+            rule.addDataColumn(EnterprisePostDO.class, "enterprise_id");
         };
     }
 }

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

@@ -8,7 +8,6 @@ import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.util.monitor.TracerUtils;
 import com.citu.framework.common.util.servlet.ServletUtils;
 import com.citu.framework.common.util.validation.ValidationUtils;
-import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.system.controller.app.auth.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
@@ -36,16 +35,13 @@ import com.xingyuv.captcha.service.CaptchaService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
-import java.util.Map;
 import java.util.Objects;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 

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

@@ -20,6 +20,7 @@ import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import com.citu.module.system.api.logger.LoginLogApi;
 import com.citu.module.system.api.logger.dto.LoginLogCreateReqDTO;
 import com.citu.module.system.api.oauth2.OAuth2TokenApi;
@@ -45,7 +46,6 @@ import java.util.Objects;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 
@@ -155,7 +155,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
     @Override
     @DSTransactional
     public AppMdeAuthLoginRespVO switchLogin(AppEnterpriseAuthSwitchLoginReqVO reqVO) {
-        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = LoginUserContext.get();
         // 查询用户
         MdeUserDO user = userService.getMdeUser(loginUser.getId());
         EnterpriseUserBindDO bindUser = check2(reqVO.getEnterpriseId(), user.getId(), user.getPhone(),
@@ -265,7 +265,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
     }
 
     private void createLogoutLog(Long userId) {
-        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = LoginUserContext.get();
         MdeUserDO user = userService.getMdeUser(loginUser.getId());
         LoginLogCreateReqDTO reqDTO = new LoginLogCreateReqDTO();
         reqDTO.setLogType(LoginLogTypeEnum.LOGOUT_SELF.getType());
@@ -283,7 +283,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
     public AppMdeAuthLoginRespVO refreshToken(String accessToken, String refreshToken) {
         // 获取令牌的基础信息
         OAuth2AccessTokenCheckRespDTO token = oauth2TokenApi.getAccessToken(accessToken).getCheckedData();
-        if(null == token) {
+        if (null == token) {
             throw exception(MDE_AUTH_TOKEN_EXPIRED);
         }
         OAuth2AccessTokenRespDTO accessTokenDO = oauth2TokenApi.refreshAccessToken2(

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

@@ -3,11 +3,12 @@ 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.app.person.cvattachment.AppCvAttachmentSaveReqVO;
 import com.citu.module.menduner.system.controller.base.cvattachment.CvAttachmentPageReqVO;
 import com.citu.module.menduner.system.controller.base.cvattachment.CvAttachmentSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import com.citu.module.menduner.system.dal.mysql.cvattachment.CvAttachmentMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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_MAX_EXISTS;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_CV_ATTACHMENT_NOT_EXISTS;
 
@@ -76,7 +76,7 @@ public class CvAttachmentServiceImpl implements CvAttachmentService {
     @Override
     @DSTransactional
     public void create(AppCvAttachmentSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (cvAttachmentMapper.countByUserId(userId) > 5) {
             throw exception(MDE_CV_ATTACHMENT_MAX_EXISTS);
         }
@@ -97,7 +97,7 @@ public class CvAttachmentServiceImpl implements CvAttachmentService {
 
     @Override
     public List<CvAttachmentDO> getList() {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         return cvAttachmentMapper.selectListByUserId(userId);
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImpl.java

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.eduexp;
 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.app.person.eduexp.AppEduExpSaveReqVO;
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.eduexp.AppEduExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.mysql.eduexp.EduExpMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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_EDU_EXP_NOT_EXISTS;
 
 /**
@@ -35,7 +35,7 @@ public class EduExpServiceImpl implements EduExpService {
     public Long createEduExp(EduExpSaveReqVO createReqVO) {
         // 插入
         EduExpDO eduExp = BeanUtils.toBean(createReqVO, EduExpDO.class);
-        eduExp.setUserId(getLoginUserId());
+        eduExp.setUserId(LoginUserContext.getUserId());
         eduExpMapper.insert(eduExp);
         // 返回
         return eduExp.getId();
@@ -48,7 +48,7 @@ public class EduExpServiceImpl implements EduExpService {
         validateEduExpExists(updateReqVO.getId());
         // 更新
         EduExpDO updateObj = BeanUtils.toBean(updateReqVO, EduExpDO.class);
-        updateObj.setUserId(getLoginUserId());
+        updateObj.setUserId(LoginUserContext.getUserId());
         eduExpMapper.updateById(updateObj);
     }
 
@@ -86,7 +86,7 @@ public class EduExpServiceImpl implements EduExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean saveEduExp(AppEduExpSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         EduExpDO entity = eduExpMapper.selectOne(EduExpDO::getId, reqVO.getId());
         EduExpDO eduExpDO = BeanUtils.toBean(reqVO, EduExpDO.class);
         eduExpDO.setUserId(userId);
@@ -102,7 +102,7 @@ public class EduExpServiceImpl implements EduExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removeEduExp(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validate(id, userId);
         // 删除
@@ -111,6 +111,6 @@ public class EduExpServiceImpl implements EduExpService {
 
     @Override
     public List<EduExpDO> getEduExpList() {
-        return eduExpMapper.selectList(EduExpDO::getUserId, getLoginUserId());
+        return eduExpMapper.selectList(EduExpDO::getUserId, LoginUserContext.getUserId());
     }
 }

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

@@ -2,6 +2,10 @@ package com.citu.module.menduner.system.service.enterprise;
 
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseAlbumReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseWelfareReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSaveReqVO;
@@ -11,6 +15,8 @@ import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpris
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -86,6 +92,7 @@ public interface EnterpriseService {
      */
     List<EnterpriseDO> getEnterpriseList(EnterpriseListReqVO reqVO);
 
+    // ========== 求职端 ==========
     /**
      * 点击执行埋点
      **/
@@ -130,4 +137,34 @@ public interface EnterpriseService {
      **/
     List<CommonRespVO> searchByName(String name);
 
+    // ========== 招聘端 ==========
+
+    /**
+     * 修改logo
+     * @param logoUrl
+     **/
+    void uploadLogo(String logoUrl);
+
+    /**
+     * 修改企业相册
+     * @param reqVO
+     **/
+    void uploadAlbum(AppAdminEnterpriseAlbumReqVO reqVO);
+
+    /**
+     * 修改企业福利标签
+     * @param reqVO
+     **/
+    void uploadWelfare(AppAdminEnterpriseWelfareReqVO reqVO);
+
+    /**
+     * 修改企业基本信息
+     * @param reqVO
+     **/
+    void update(AppAdminEnterpriseSaveReqVO reqVO);
+
+    /**
+     * 获取企业基本信息
+     **/
+    AppAdminEnterpriseRespVO get();
 }

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

@@ -1,18 +1,23 @@
 package com.citu.module.menduner.system.service.enterprise;
 
 import cn.hutool.core.collection.CollUtil;
+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.datapermission.core.annotation.DataPermission;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSaveReqVO;
-import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSimpleRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseAlbumReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseWelfareReqVO;
+import com.citu.module.menduner.system.controller.base.CommonRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
@@ -23,6 +28,7 @@ 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.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -179,4 +185,50 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return enterpriseMapper.searchByName(name);
     }
 
+    public EnterpriseDO selectEnterprise() {
+        EnterpriseDO enterprise = getEnterprise(LoginUserContext.getEnterpriseId());
+        if (null == enterprise) {
+            throw exception(MDE_ENTERPRISE_NOT_EXISTS);
+        }
+        return enterprise;
+    }
+
+    @Override
+    @DSTransactional
+    public void uploadLogo(String logoUrl) {
+        EnterpriseDO enterprise = selectEnterprise();
+        enterprise.setLogoUrl(logoUrl);
+        enterpriseMapper.updateById(enterprise);
+    }
+
+    @Override
+    @DSTransactional
+    public void uploadAlbum(AppAdminEnterpriseAlbumReqVO reqVO) {
+        EnterpriseDO enterprise = selectEnterprise();
+        enterprise.setAlbumList(reqVO.getAlbumList());
+        enterpriseMapper.updateById(enterprise);
+    }
+
+    @Override
+    @DSTransactional
+    public void uploadWelfare(AppAdminEnterpriseWelfareReqVO reqVO) {
+        EnterpriseDO enterprise = selectEnterprise();
+        enterprise.setWelfareList(reqVO.getWelfareList());
+        enterpriseMapper.updateById(enterprise);
+    }
+
+    @Override
+    @DSTransactional
+    public void update(AppAdminEnterpriseSaveReqVO reqVO) {
+        EnterpriseDO enterprise = selectEnterprise();
+        // 更新
+        EnterpriseDO updateObj = EnterpriseConvert.INSTANCE.convert12(reqVO);
+        updateObj.setId(enterprise.getId());
+        enterpriseMapper.updateById(updateObj);
+    }
+
+    @Override
+    public AppAdminEnterpriseRespVO get() {
+        return EnterpriseConvert.INSTANCE.convert13(selectEnterprise());
+    }
 }

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

@@ -7,8 +7,8 @@ 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.app.enterprise.vo.AppEnterpriseUserBindRespVO;
-import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserPageReqVO;
+import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserSaveReqVO;
 import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
@@ -23,6 +23,7 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMa
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -34,9 +35,8 @@ import java.util.List;
 
 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.util.SecurityFrameworkUtils.getLoginUser;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
+import static com.citu.module.menduner.system.util.LoginUserContext.checkUserTypeIsAdmin;
 
 /**
  * 门墩儿-企业登录用户 Service 实现类
@@ -141,7 +141,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
 
     @Override
     public List<AppEnterpriseUserBindRespVO> getBindList() {
-        List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
+        List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(LoginUserContext.getUserId());
         if (null == list) {
             return Collections.emptyList();
         }
@@ -185,11 +185,11 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
 
     @Override
     public AppAdminUserRespVO getBindEnterprise() {
-        LoginUser loginUser = validAppAdmin();
+        LoginUser loginUser = checkUserTypeIsAdmin();
 
         EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
                 .selectByEnterpriseIdAndUserId(
-                        Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)), loginUser.getId());
+                        LoginUserContext.getEnterpriseId(loginUser), loginUser.getId());
         if (null == userBindDO) {
             throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
         }
@@ -243,12 +243,12 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     private EnterpriseUserBindDO valid(Long id) {
-        LoginUser loginUser = validAppAdmin();
+        LoginUser loginUser = checkUserTypeIsAdmin();
 
         // 查找操作的目标用户
         EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
                 .selectByEnterpriseIdAndId(
-                        Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)), id);
+                        LoginUserContext.getEnterpriseId(loginUser), id);
 
         if (null == userBindDO) {
             throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
@@ -259,24 +259,10 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         return userBindDO;
     }
 
-    /**
-     * 校验是否app 管理员用户
-     **/
-    private LoginUser validAppAdmin() {
-        LoginUser loginUser = getLoginUser();
-
-        // 判断操作者是否有权限操作
-        if (!UserTypeEnum.MEMBER_ADMIN.getValue()
-                .equals(loginUser.getUserType())) {
-            throw exception(FORBIDDEN);
-        }
-        return loginUser;
-    }
 
     @Override
     public PageResult<AppAdminUserRespVO> selectPage(AppAdminUserPageReqVO reqVO) {
-        LoginUser loginUser = validAppAdmin();
-        Long enterpriseId = Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID));
-        return enterpriseUserBindMapper.selectPage(reqVO, enterpriseId);
+        LoginUser loginUser = checkUserTypeIsAdmin();
+        return enterpriseUserBindMapper.selectPage(reqVO,  LoginUserContext.getEnterpriseId(loginUser));
     }
 }

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

@@ -2,6 +2,10 @@ package com.citu.module.menduner.system.service.enterprise.business;
 
 import javax.validation.*;
 
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessSaveReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
@@ -52,4 +56,16 @@ public interface EnterpriseBusinessService {
      */
     PageResult<EnterpriseBusinessDO> getEnterpriseBusinessPage(EnterpriseBusinessPageReqVO pageReqVO);
 
+    // ========== 招聘端 ==========
+
+    /**
+     * 修改企业营业执照信息
+     * @param reqVO
+     **/
+    void update(AppAdminEnterpriseBusinessSaveReqVO reqVO);
+
+    /**
+     * 获取企业营业执照信息
+     **/
+    AppAdminEnterpriseBusinessRespVO get();
 }

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

@@ -1,11 +1,19 @@
 package com.citu.module.menduner.system.service.enterprise.business;
 
+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.appadmin.enterprise.vo.AppAdminEnterpriseBusinessRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessSaveReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessSaveReqVO;
+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;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -13,6 +21,7 @@ import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_BUSINESS_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_NOT_EXISTS;
 
 /**
  * 门墩儿-企业工商信息 Service 实现类
@@ -68,4 +77,28 @@ public class EnterpriseBusinessServiceImpl implements EnterpriseBusinessService
         return enterpriseBusinessMapper.selectPage(pageReqVO);
     }
 
+    public EnterpriseBusinessDO selectBusiness() {
+        EnterpriseBusinessDO businessDO =
+                enterpriseBusinessMapper.selectByEnterpriseId(LoginUserContext.getEnterpriseId());
+        if (null == businessDO) {
+            throw exception(MDE_ENTERPRISE_BUSINESS_NOT_EXISTS);
+        }
+        return businessDO;
+    }
+
+
+    @Override
+    @DSTransactional
+    public void update(AppAdminEnterpriseBusinessSaveReqVO reqVO) {
+        EnterpriseBusinessDO businessDO = selectBusiness();
+        // 更新
+        EnterpriseBusinessDO updateObj = EnterpriseConvert.INSTANCE.convert14(reqVO);
+        updateObj.setId(businessDO.getId());
+        enterpriseBusinessMapper.updateById(updateObj);
+    }
+
+    @Override
+    public AppAdminEnterpriseBusinessRespVO get() {
+        return EnterpriseConvert.INSTANCE.convert15(selectBusiness());
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.citu.module.menduner.system.service.enterprise.post;
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostPageReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterprisePostRespVO;
@@ -54,6 +57,7 @@ public interface EnterprisePostService {
      */
     PageResult<EnterprisePostDO> getEnterprisePostPage(EnterprisePostPageReqVO pageReqVO);
 
+    // ========= 求职端 ==========
 
     /**
      * 根据企业id查询岗位信息
@@ -61,4 +65,44 @@ public interface EnterprisePostService {
      */
     List<AppEnterprisePostRespVO> selectListByEnterpriseId(Long enterpriseId);
 
+
+    // ========== 招聘端 ==========
+
+    /**
+     * 新增企业岗位信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long create(@Valid AppAdminEnterprisePostSaveReqVO createReqVO);
+
+    /**
+     * 更新企业岗位信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void update(@Valid AppAdminEnterprisePostSaveReqVO updateReqVO);
+
+    /**
+     * 删除企业岗位信息
+     *
+     * @param id 编号
+     */
+    void delete(Long id);
+
+    /**
+     * 获得企业岗位信息
+     *
+     * @param id 编号
+     * @return 门墩儿-企业岗位信息
+     */
+    AppAdminEnterprisePostRespVO get(Long id);
+
+    /**
+     * 获得企业岗位信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 门墩儿-企业岗位信息分页
+     */
+    PageResult<AppAdminEnterprisePostRespVO> page(AppAdminEnterprisePostPageReqVO pageReqVO);
 }

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

@@ -1,13 +1,19 @@
 package com.citu.module.menduner.system.service.enterprise.post;
 
+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.appadmin.enterprise.post.AppAdminEnterprisePostPageReqVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.post.AppAdminEnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostSaveReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterprisePostRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
+import com.citu.module.menduner.system.convert.EnterprisePostConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterprisePostMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -81,4 +87,45 @@ public class EnterprisePostServiceImpl implements EnterprisePostService {
         List<EnterprisePostDO> list = enterprisePostMapper.selectListByEnterpriseId(enterpriseId);
         return EnterpriseConvert.INSTANCE.convertList2(list);
     }
+
+    @Override
+    @DSTransactional
+    public Long create(AppAdminEnterprisePostSaveReqVO createReqVO) {
+        // 插入
+        EnterprisePostDO enterprisePost = EnterprisePostConvert.INSTANCE.convert(createReqVO);
+        enterprisePost.setEnterpriseId(LoginUserContext.getEnterpriseId());
+        enterprisePostMapper.insert(enterprisePost);
+        // 返回
+        return enterprisePost.getId();
+    }
+
+    @Override
+    @DSTransactional
+    public void update(AppAdminEnterprisePostSaveReqVO updateReqVO) {
+        // 校验存在
+        validateEnterprisePostExists(updateReqVO.getId());
+        // 更新
+        EnterprisePostDO updateObj =  EnterprisePostConvert.INSTANCE.convert(updateReqVO);
+        enterprisePostMapper.updateById(updateObj);
+    }
+
+    @Override
+    @DSTransactional
+    public void delete(Long id) {
+      deleteEnterprisePost(id);
+    }
+
+    @Override
+    public AppAdminEnterprisePostRespVO get(Long id) {
+        EnterprisePostDO postDO = enterprisePostMapper.selectById(id);
+        if (null == postDO) {
+            throw exception(ENTERPRISE_POST_NOT_EXISTS);
+        }
+        return  EnterprisePostConvert.INSTANCE.convert2(postDO);
+    }
+
+    @Override
+    public PageResult<AppAdminEnterprisePostRespVO> page(AppAdminEnterprisePostPageReqVO pageReqVO) {
+        return enterprisePostMapper.page(pageReqVO);
+    }
 }

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

@@ -4,11 +4,11 @@ package com.citu.module.menduner.system.service.enterprise.register;
 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.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterAuditReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterSaveReqVO;
-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;
@@ -23,13 +23,13 @@ import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditS
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
 import com.citu.module.menduner.system.enums.permission.MdeDefaultRoleEnum;
 import com.citu.module.menduner.system.service.permission.MdePermissionService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
 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.*;
 
 /**
@@ -175,19 +175,19 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
     @Override
     @DSTransactional
     public void apply(AppEnterpriseRegisterReqVO reqVO) {
-        if (enterpriseRegisterMapper.selectCountByUserIdAndStatus( getLoginUserId(),
+        if (enterpriseRegisterMapper.selectCountByUserIdAndStatus(LoginUserContext.getUserId(),
                 EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()) > 0) {
             // 存在审批中的申请
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
         EnterpriseRegisterDO register = EnterpriseConvert.INSTANCE.convert6(reqVO);
         register.setStatus(EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus());
-        register.setUserId(getLoginUserId());
+        register.setUserId(LoginUserContext.getUserId());
         enterpriseRegisterMapper.insert(register);
     }
 
     @Override
     public AppEnterpriseRegisterRespVO getApplyByUserId() {
-        return EnterpriseConvert.INSTANCE.convert8(enterpriseRegisterMapper.selectByUserId(getLoginUserId()));
+        return EnterpriseConvert.INSTANCE.convert8(enterpriseRegisterMapper.selectByUserId(LoginUserContext.getUserId()));
     }
 }

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

@@ -3,11 +3,11 @@ package com.citu.module.menduner.system.service.enterprise.user;
 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.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.user.EnterpriseUserApplyAuditReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.user.EnterpriseUserApplyPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.user.EnterpriseUserApplySaveReqVO;
-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;
@@ -19,13 +19,13 @@ import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
 import com.citu.module.menduner.system.enums.permission.MdeDefaultRoleEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseUserApplyService;
 import com.citu.module.menduner.system.service.permission.MdePermissionService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
 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.*;
 
 /**
@@ -149,18 +149,20 @@ public class EnterpriseUserApplyServiceImpl implements EnterpriseUserApplyServic
     @DSTransactional
     public void apply(AppEnterpriseUserApplyReqVO reqVO) {
         if (enterpriseUserApplyMapper
-                .selectCountByUserIdAndStatus(getLoginUserId(),
+                .selectCountByUserIdAndStatus(LoginUserContext.getUserId(),
                         EnterpriseUserApplyAuditStatusEnum.AUDITING.getStatus()) > 0) {
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
         EnterpriseUserApplyDO applyDO = EnterpriseConvert.INSTANCE.convert10(reqVO);
         applyDO.setStatus(EnterpriseUserApplyAuditStatusEnum.AUDITING.getStatus());
-        applyDO.setUserId(getLoginUserId());
+        applyDO.setUserId(LoginUserContext.getUserId());
         enterpriseUserApplyMapper.insert(applyDO);
     }
 
     @Override
     public AppEnterpriseUserApplyRespVO getApplyByUserId() {
-        return EnterpriseConvert.INSTANCE.convert9(enterpriseUserApplyMapper.selectByUserId(getLoginUserId()));
+        return EnterpriseConvert.INSTANCE.convert9(
+                enterpriseUserApplyMapper.selectByUserId(LoginUserContext.getUserId())
+        );
     }
 }

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

@@ -26,6 +26,7 @@ import com.citu.module.menduner.system.mq.producer.ESProducer;
 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.ESOperateEnum;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -42,7 +43,6 @@ 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;
 
 /**
@@ -391,14 +391,9 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Override
     @DSTransactional
     public boolean save(AppAdminJobSaveReqVO reqVO) {
-        LoginUser loginUser = getLoginUser();
-        if (null == loginUser
-                || null == loginUser.getInfo()) {
-            // 没权限
-            throw exception(FORBIDDEN);
-        }
+        LoginUser loginUser = LoginUserContext.get();
         JobAdvertisedDO job = JobAdvertisedConvert.INSTANCE.convert3(reqVO);
-        Long enterpriseId = Long.valueOf(loginUser.getInfo().get(INFO_KEY_DATA_ID));
+        Long enterpriseId =LoginUserContext.getEnterpriseId(loginUser);
         if (null == reqVO.getId()) {
             // 新增
 

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

@@ -12,6 +12,7 @@ import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.cv.JobCvRelStatusEnum;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -89,7 +90,7 @@ public class JobCvRelServiceImpl implements JobCvRelService {
         if (MendunerStatusEnum.DISABLE.getStatus().equals(job.getStatus())) {
             throw exception(JOB_CV_REL_JOB_STOP_DELIVERY);
         }
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 效验某段时间是否投递过
         if (jobCvRelMapper.checkDataWithin15Day(userId, reqVO.getJobId())) {
             throw exception(JOB_CV_REL_EXISTS);

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

@@ -10,7 +10,6 @@ import com.citu.module.menduner.system.controller.appadmin.cv.AppAdminJobCvRelPa
 import com.citu.module.menduner.system.controller.appadmin.cv.AppAdminJobCvRelRespVO;
 import com.citu.module.menduner.system.controller.appadmin.job.vo.AppAdminJobPageReqVO;
 import com.citu.module.menduner.system.controller.appadmin.job.vo.AppAdminJobRespVO;
-import com.citu.module.menduner.system.controller.appadmin.person.vo.AppAdminPersonSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.contact.AppEnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobCvRelPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.favorite.PersonJobFavoritePageReqVO;
@@ -31,6 +30,7 @@ import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBin
 import com.citu.module.menduner.system.service.person.favorite.PersonJobFavoriteService;
 import com.citu.module.menduner.system.service.person.subscribe.PersonEnterpriseSubscribeService;
 import com.citu.module.menduner.system.util.ESQueryBuildUtils;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -55,8 +55,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
 @Slf4j
 @Service
 @Validated
@@ -105,7 +103,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     @Override
     public PageResult<AppJobAdvertisedRespVO> getJobCvPage(PageParam page) {
         // 获取已投递的职位
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
 
         // 查询投递的简历
         JobCvRelPageReqVO relPageReqVO = new JobCvRelPageReqVO();
@@ -123,7 +121,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
     @Override
     public PageResult<AppJobAdvertisedRespVO> getJobFavoritePage(PageParam page) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         PersonJobFavoritePageReqVO pageReqVO = new PersonJobFavoritePageReqVO();
         pageReqVO.setPageNo(page.getPageNo());
         pageReqVO.setPageSize(page.getPageSize());
@@ -142,7 +140,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
     @Override
     public PageResult<AppEnterpriseSimpleRespVO> getEnterpriseSubscribePage(PageParam page) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         PersonEnterpriseSubscribePageReqVO pageReqVO = new PersonEnterpriseSubscribePageReqVO();
         pageReqVO.setPageNo(page.getPageNo());
         pageReqVO.setPageSize(page.getPageSize());

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

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.job;
 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.app.person.job.AppJobInterestedSaveReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobInterestedPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobInterestedSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.job.AppJobInterestedSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobInterestedDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobInterestedMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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_JOB_INTERESTED_NOT_EXISTS;
 
 /**
@@ -81,7 +81,7 @@ public class JobInterestedServiceImpl implements JobInterestedService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removeJobInterested(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validateJobInterestedExists(id, userId);
         // 删除
@@ -91,7 +91,7 @@ public class JobInterestedServiceImpl implements JobInterestedService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean saveJobInterested(AppJobInterestedSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         JobInterestedDO entity = jobInterestedMapper.selectOne(JobInterestedDO::getId, reqVO.getId());
         JobInterestedDO jobInterestedDO = BeanUtils.toBean(reqVO, JobInterestedDO.class);
         jobInterestedDO.setUserId(userId);
@@ -106,6 +106,6 @@ public class JobInterestedServiceImpl implements JobInterestedService {
 
     @Override
     public List<JobInterestedDO> getJobInterestedList() {
-        return jobInterestedMapper.selectList(JobInterestedDO::getUserId, getLoginUserId());
+        return jobInterestedMapper.selectList(JobInterestedDO::getUserId, LoginUserContext.getUserId());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteServiceImpl.java

@@ -3,18 +3,18 @@ package com.citu.module.menduner.system.service.person.favorite;
 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.app.person.job.AppPersonJobFavoriteReqVO;
 import com.citu.module.menduner.system.controller.base.person.favorite.PersonJobFavoritePageReqVO;
 import com.citu.module.menduner.system.controller.base.person.favorite.PersonJobFavoriteSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.job.AppPersonJobFavoriteReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonJobFavoriteMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
 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.PERSON_JOB_COLLECTION_EXISTS;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.PERSON_JOB_COLLECTION_NOT_EXISTS;
 
@@ -76,7 +76,7 @@ public class PersonJobFavoriteServiceImpl implements PersonJobFavoriteService {
 
     @Override
     public Boolean isFavorite(Long jobId) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (null == userId) {
             // 未登录
             return false;
@@ -86,13 +86,14 @@ public class PersonJobFavoriteServiceImpl implements PersonJobFavoriteService {
 
     @Override
     public Long countByUserId() {
-        return personJobFavoriteMapper.selectCount(PersonJobFavoriteDO::getUserId, getLoginUserId());
+        return personJobFavoriteMapper.selectCount(
+                PersonJobFavoriteDO::getUserId, LoginUserContext.getUserId());
     }
 
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean favorite(AppPersonJobFavoriteReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (null == userId) {
             // 未登录
             return false;
@@ -118,7 +119,7 @@ public class PersonJobFavoriteServiceImpl implements PersonJobFavoriteService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean unFavorite(Long jobId) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (null == userId) {
             // 未登录
             return false;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/info/PersonInfoServiceImpl.java

@@ -3,19 +3,19 @@ package com.citu.module.menduner.system.service.person.info;
 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.base.person.info.PersonInfoPageReqVO;
-import com.citu.module.menduner.system.controller.base.person.info.PersonInfoSaveReqVO;
 import com.citu.module.menduner.system.controller.app.person.resume.AppPersonAdvantageSaveReqVO;
 import com.citu.module.menduner.system.controller.app.person.resume.AppPersonInfoSaveReqVO;
+import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
+import com.citu.module.menduner.system.controller.base.person.info.PersonInfoSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
 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_PERSON_INFO_NOT_EXISTS;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_INFO_NOT_EXISTS;
 
@@ -84,7 +84,7 @@ public class PersonInfoServiceImpl implements PersonInfoService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public boolean saveInfo(AppPersonInfoSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         PersonInfoDO info = personInfoMapper.selectOne(PersonInfoDO::getUserId, userId);
         PersonInfoDO userInfo = BeanUtils.toBean(reqVO, PersonInfoDO.class);
         userInfo.setUserId(userId);
@@ -100,7 +100,7 @@ public class PersonInfoServiceImpl implements PersonInfoService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public boolean saveAdvantage(AppPersonAdvantageSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         PersonInfoDO info = personInfoMapper.selectOne(PersonInfoDO::getUserId, userId);
         if (null == info) {
             throw exception(MDE_PERSON_INFO_NOT_EXISTS);
@@ -114,7 +114,7 @@ public class PersonInfoServiceImpl implements PersonInfoService {
     @Override
     @DSTransactional
     public boolean updateJobStatus(String status) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         PersonInfoDO info = personInfoMapper.selectOne(PersonInfoDO::getUserId, userId);
         if (null == info) {
             throw exception(MDE_PERSON_INFO_NOT_EXISTS);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/skill/PersonSkillServiceImpl.java

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.person.skill;
 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.app.person.skill.AppPersonSkillSaveReqVO;
 import com.citu.module.menduner.system.controller.base.person.skill.PersonSkillPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.skill.PersonSkillSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.skill.AppPersonSkillSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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_USER_SKILL_EXISTS;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_USER_SKILL_NOT_EXISTS;
 
@@ -81,13 +81,13 @@ public class PersonSkillServiceImpl implements PersonSkillService {
 
     @Override
     public List<PersonSkillDO> getPersonSkillList() {
-        return personSkillMapper.selectList(PersonSkillDO::getUserId, getLoginUserId());
+        return personSkillMapper.selectList(PersonSkillDO::getUserId, LoginUserContext.getUserId());
     }
 
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean savePersonSkill(AppPersonSkillSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (personSkillMapper.existByUserIdAndSkillId(userId, reqVO.getId(), reqVO.getSkillId())) {
             throw exception(MDE_USER_SKILL_EXISTS);
         }
@@ -107,7 +107,7 @@ public class PersonSkillServiceImpl implements PersonSkillService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removePersonSkill(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validate(id, userId);
         // 删除

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeServiceImpl.java

@@ -3,19 +3,20 @@ package com.citu.module.menduner.system.service.person.subscribe;
 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.app.person.enterprise.PersonEnterpriseSubscribeReqVO;
 import com.citu.module.menduner.system.controller.base.person.subscribe.PersonEnterpriseSubscribePageReqVO;
 import com.citu.module.menduner.system.controller.base.person.subscribe.PersonEnterpriseSubscribeSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.enterprise.PersonEnterpriseSubscribeReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonEnterpriseSubscribeDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonEnterpriseSubscribeMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
 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.*;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.PERSON_ENTERPRISE_ATTENTION_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.PERSON_ENTERPRISE_ATTENTION_NOT_EXISTS;
 
 /**
  * 门墩儿-人才-企业关注订阅 Service 实现类
@@ -73,23 +74,24 @@ public class PersonEnterpriseSubscribeServiceImpl implements PersonEnterpriseSub
 
     @Override
     public Boolean isSubscribe(Long enterpriseId) {
-        Long userId = getLoginUserId();
-        if(null == userId) {
+        Long userId = LoginUserContext.getUserId();
+        if (null == userId) {
             // 未登录
             return false;
         }
-        return null != personEnterpriseSubscribeMapper.selectByUserIdAndEnterpriseId(userId,enterpriseId);
+        return null != personEnterpriseSubscribeMapper.selectByUserIdAndEnterpriseId(userId, enterpriseId);
     }
 
     @Override
     public Long countByUserId() {
-        return personEnterpriseSubscribeMapper.selectCount(PersonEnterpriseSubscribeDO::getUserId, getLoginUserId());
+        return personEnterpriseSubscribeMapper.selectCount(
+                PersonEnterpriseSubscribeDO::getUserId, LoginUserContext.getUserId());
     }
 
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean subscribe(PersonEnterpriseSubscribeReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (null == userId) {
             // 未登录
             return false;
@@ -115,13 +117,13 @@ public class PersonEnterpriseSubscribeServiceImpl implements PersonEnterpriseSub
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean unSubscribe(Long enterpriseId) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         if (null == userId) {
             // 未登录
             return false;
         }
         if (null != personEnterpriseSubscribeMapper.selectByUserIdAndEnterpriseId(userId, enterpriseId)) {
-           return personEnterpriseSubscribeMapper.deleteByUserIdAndEnterpriseId(userId, enterpriseId);
+            return personEnterpriseSubscribeMapper.deleteByUserIdAndEnterpriseId(userId, enterpriseId);
         }
         return false;
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -19,6 +19,7 @@ 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.service.visits.MdeVisitsService;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -34,7 +35,6 @@ import java.util.stream.Stream;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertSet;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_POSITION_NOT_EXISTS;
 
 /**
@@ -237,7 +237,7 @@ public class PositionServiceImpl implements PositionService {
         List<Long> ids = visitsService.getBizIdVisitsTop10List(
                 MdeVisitsListReqVO.builder()
                         .type(MdeVisitsEnum.POSITION_CLICK.getType())
-                        .userId(getLoginUserId())
+                        .userId(LoginUserContext.getUserId())
                         .build()
         );
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/projectexp/ProjectExpServiceImpl.java

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.projectexp;
 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.app.person.projectexp.AppProjectExpSaveReqVO;
 import com.citu.module.menduner.system.controller.base.projectexp.ProjectExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.projectexp.ProjectExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.projectexp.AppProjectExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.projectexp.ProjectExpDO;
 import com.citu.module.menduner.system.dal.mysql.projectexp.ProjectExpMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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.PROJECT_EXP_NOT_EXISTS;
 
 /**
@@ -35,7 +35,7 @@ public class ProjectExpServiceImpl implements ProjectExpService {
     public Long createProjectExp(ProjectExpSaveReqVO createReqVO) {
         // 插入
         ProjectExpDO projectExp = BeanUtils.toBean(createReqVO, ProjectExpDO.class);
-        projectExp.setUserId(getLoginUserId());
+        projectExp.setUserId(LoginUserContext.getUserId());
         projectExpMapper.insert(projectExp);
         // 返回
         return projectExp.getId();
@@ -48,7 +48,7 @@ public class ProjectExpServiceImpl implements ProjectExpService {
         validateProjectExpExists(updateReqVO.getId());
         // 更新
         ProjectExpDO updateObj = BeanUtils.toBean(updateReqVO, ProjectExpDO.class);
-        updateObj.setUserId(getLoginUserId());
+        updateObj.setUserId(LoginUserContext.getUserId());
         projectExpMapper.updateById(updateObj);
     }
 
@@ -86,7 +86,7 @@ public class ProjectExpServiceImpl implements ProjectExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean saveProjectExp(AppProjectExpSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         ProjectExpDO entity = projectExpMapper.selectOne(ProjectExpDO::getId, reqVO.getId());
         ProjectExpDO projectExpDO = BeanUtils.toBean(reqVO, ProjectExpDO.class);
         projectExpDO.setUserId(userId);
@@ -102,7 +102,7 @@ public class ProjectExpServiceImpl implements ProjectExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removeProjectExp(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validate(id, userId);
         // 删除
@@ -111,6 +111,6 @@ public class ProjectExpServiceImpl implements ProjectExpService {
 
     @Override
     public List<ProjectExpDO> getProjectExpList() {
-        return projectExpMapper.selectList(ProjectExpDO::getUserId, getLoginUserId());
+        return projectExpMapper.selectList(ProjectExpDO::getUserId, LoginUserContext.getUserId());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/trainexp/TrainExpServiceImpl.java

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.trainexp;
 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.app.person.trainexp.AppTrainExpSaveReqVO;
 import com.citu.module.menduner.system.controller.base.trainexp.TrainExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.trainexp.TrainExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.trainexp.AppTrainExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.trainexp.TrainExpDO;
 import com.citu.module.menduner.system.dal.mysql.trainexp.TrainExpMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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.TRAIN_EXP_NOT_EXISTS;
 
 /**
@@ -81,7 +81,7 @@ public class TrainExpServiceImpl implements TrainExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean saveTrainExp(AppTrainExpSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         TrainExpDO entity = trainExpMapper.selectOne(TrainExpDO::getId, reqVO.getId());
         TrainExpDO trainExpDO = BeanUtils.toBean(reqVO, TrainExpDO.class);
         trainExpDO.setUserId(userId);
@@ -97,7 +97,7 @@ public class TrainExpServiceImpl implements TrainExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removeTrainExp(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validate(id, userId);
         // 删除
@@ -106,6 +106,6 @@ public class TrainExpServiceImpl implements TrainExpService {
 
     @Override
     public List<TrainExpDO> getTrainExpList() {
-        return trainExpMapper.selectList(TrainExpDO::getUserId, getLoginUserId());
+        return trainExpMapper.selectList(TrainExpDO::getUserId, LoginUserContext.getUserId());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/visits/MdeVisitsServiceImpl.java

@@ -9,6 +9,7 @@ import com.citu.module.menduner.system.controller.base.visits.MdeVisitsSaveReqVO
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import com.citu.module.menduner.system.dal.mysql.visits.MdeVisitsMapper;
 import com.citu.module.menduner.system.mq.message.MdeVisitsSendMessage;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -82,7 +83,7 @@ public class MdeVisitsServiceImpl implements MdeVisitsService {
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void create(MdeVisitsSendMessage reqVO) {
 
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
 
         MdeVisitsDO visitsDO = mdeVisitsMapper.
                 getMdeVisitsByUserIdAndTypeAndBizIdAndDate(userId, reqVO.getType(), reqVO.getBizId(), reqVO.getDate());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImpl.java

@@ -3,11 +3,12 @@ package com.citu.module.menduner.system.service.workexp;
 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.app.person.workexp.AppWorkExpSaveReqVO;
 import com.citu.module.menduner.system.controller.base.workexp.WorkExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.workexp.WorkExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.workexp.AppWorkExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
 import com.citu.module.menduner.system.dal.mysql.workexp.WorkExpMapper;
+import com.citu.module.menduner.system.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,7 +16,6 @@ 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_WORK_EXP_NOT_EXISTS;
 
 /**
@@ -35,7 +35,7 @@ public class WorkExpServiceImpl implements WorkExpService {
     public Long createWorkExp(WorkExpSaveReqVO createReqVO) {
         // 插入
         WorkExpDO workExp = BeanUtils.toBean(createReqVO, WorkExpDO.class);
-        workExp.setUserId(getLoginUserId());
+        workExp.setUserId(LoginUserContext.getUserId());
         workExpMapper.insert(workExp);
         // 返回
         return workExp.getId();
@@ -48,7 +48,7 @@ public class WorkExpServiceImpl implements WorkExpService {
         validateWorkExpExists(updateReqVO.getId());
         // 更新
         WorkExpDO updateObj = BeanUtils.toBean(updateReqVO, WorkExpDO.class);
-        updateObj.setUserId(getLoginUserId());
+        updateObj.setUserId(LoginUserContext.getUserId());
         workExpMapper.updateById(updateObj);
     }
 
@@ -86,7 +86,7 @@ public class WorkExpServiceImpl implements WorkExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean saveWorkExp(AppWorkExpSaveReqVO reqVO) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         WorkExpDO entity = workExpMapper.selectOne(WorkExpDO::getId, reqVO.getId());
         WorkExpDO eduExpDO = BeanUtils.toBean(reqVO, WorkExpDO.class);
         eduExpDO.setUserId(userId);
@@ -103,7 +103,7 @@ public class WorkExpServiceImpl implements WorkExpService {
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public void removeWorkExp(Long id) {
-        Long userId = getLoginUserId();
+        Long userId = LoginUserContext.getUserId();
         // 校验存在
         validate(id, userId);
         // 删除
@@ -112,6 +112,6 @@ public class WorkExpServiceImpl implements WorkExpService {
 
     @Override
     public List<WorkExpDO> getWorkExpList() {
-        return workExpMapper.selectByUserIdList(getLoginUserId());
+        return workExpMapper.selectByUserIdList(LoginUserContext.getUserId());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/LoginUserContext.java

@@ -0,0 +1,87 @@
+package com.citu.module.menduner.system.util;
+
+import cn.hutool.core.collection.CollUtil;
+import com.citu.framework.common.enums.UserTypeEnum;
+import com.citu.framework.security.core.LoginUser;
+
+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;
+
+/**
+ * 登录用户上下文
+ *
+ * @author rayson
+ **/
+public class LoginUserContext {
+
+    /**
+     * 获取当前登录的用户对象
+     * 为空则抛出异常
+     **/
+    public static LoginUser get() {
+        LoginUser loginUser = getLoginUser();
+        if (null == loginUser
+                || null == loginUser.getInfo()) {
+            // 没权限
+            throw exception(FORBIDDEN);
+        }
+        return loginUser;
+    }
+
+    /**
+     * 获取当前登录的用户id
+     **/
+    public static Long getUserId() {
+        return get().getId();
+    }
+
+    /**
+     * 获取当前登录的用户的企业id
+     **/
+    public static Long getEnterpriseId() {
+        LoginUser loginUser = get();
+        return getEnterpriseId(loginUser);
+    }
+
+    /**
+     * 获取当前登录的用户的企业id
+     **/
+    public static Long getEnterpriseId(LoginUser loginUser) {
+        if (!checkEnterprise(loginUser)) {
+            throw exception(FORBIDDEN);
+        }
+        return Long.valueOf(loginUser.getInfo().get(INFO_KEY_DATA_ID));
+    }
+
+    /**
+     * 效验当前用户企业信息是否存在
+     **/
+    public static boolean checkEnterprise(LoginUser loginUser) {
+        if (CollUtil.isEmpty(loginUser.getInfo())) {
+            return false;
+        }
+        if(null == loginUser.getInfo()){
+            return false;
+        }
+        if(!loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 效验当前用户企业信息是否为UserTypeEnum.MEMBER_ADMIN
+     **/
+    public static LoginUser checkUserTypeIsAdmin() {
+        LoginUser loginUser = LoginUserContext.get();
+
+        // 判断操作者是否有权限操作
+        if (!UserTypeEnum.MEMBER_ADMIN.getValue()
+                .equals(loginUser.getUserType())) {
+            throw exception(FORBIDDEN);
+        }
+        return loginUser;
+    }
+}

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

@@ -147,8 +147,16 @@
 1_200_004_001=Enterprise information does not exist
 1_200_004_002=Enterprise code cannot be empty
 1_200_004_003=No company name filled in
+1_200_004_004=Enterprise alias not filled in
+1_200_004_005=Company profile not filled in
+1_200_004_006=No industry selected
+1_200_004_007=No financing stage selected
+1_200_004_008=No personnel size selected
+1_200_004_009=No work hours filled in
 # ========== 企业工商信息  1_200_005_001 ==========
 1_200_005_001=Enterprise business information does not exist
+1_200_005_002=No company name filled in
+1_200_005_003=Unified social credit code not filled in
 # ========== 企业注册申请 1_200_006_000 ==========
 1_200_006_001=The enterprise registration application does not exist
 1_200_006_002=Enterprise registration application has been approved

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

@@ -147,8 +147,16 @@
 1_200_004_001=企业信息不存在
 1_200_004_002=企业编码不能为空
 1_200_004_003=未填写企业名称
+1_200_004_004=未填写企业别称
+1_200_004_005=未填写公司简介
+1_200_004_006=未选择所在行业
+1_200_004_007=未选择融资阶段
+1_200_004_008=未选择人员规模
+1_200_004_009=未填写上班时间
 # ========== 企业工商信息  1_200_005_001 ==========
 1_200_005_001=企业工商信息不存在
+1_200_005_002=未填写企业名称
+1_200_005_003=未填写统一社会信用代码
 # ========== 企业注册申请 1_200_006_000 ==========
 1_200_006_001=企业注册申请不存在
 1_200_006_002=企业注册申请已审批