1、增加企业登录逻辑

2、区分招聘者接口

citu-framework/citu-common/src/main/java/com/citu/framework/common/enums/UserTypeEnum.java

@@ -15,8 +15,8 @@ import java.util.Arrays;
 public enum UserTypeEnum implements IntArrayValuable {
 
     MEMBER(1, "会员"), // 面向 c 端，普通用户
-    ADMIN(2, "管理员"); // 面向 b 端，管理后台
-
+    ADMIN(2, "管理员"), // 面向 b 端，管理后台
+    MEMBER_ADMIN(3,"会员管理员"); // 面向 c 端, 管理后台
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserTypeEnum::getValue).toArray();
 
     /**

citu-framework/citu-spring-boot-starter-security/src/main/java/com/citu/framework/security/core/LoginUser.java

@@ -19,6 +19,8 @@ public class LoginUser {
 
     public static final String INFO_KEY_NICKNAME = "nickname";
     public static final String INFO_KEY_DEPT_ID = "deptId";
+    // 公共区分数据权限
+    public static final String INFO_KEY_DATA_ID = "dataId";
 
     /**
      * 用户编号

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/swagger/config/CituSwaggerAutoConfiguration.java

@@ -118,7 +118,7 @@ public class CituSwaggerAutoConfiguration {
     public static GroupedOpenApi buildGroupedOpenApi(String group, String path) {
         return GroupedOpenApi.builder()
                 .group(group)
-                .pathsToMatch("/admin-api/" + path + "/**", "/app-api/" + path + "/**")
+                .pathsToMatch("/admin-api/" + path + "/**", "/app-api/" + path + "/**", "/app-admin-api/" + path + "/**")
                 .addOperationCustomizer((operation, handlerMethod) -> operation
                         .addParametersItem(buildTenantHeaderParameter())
                         .addParametersItem(buildSecurityHeaderParameter())

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/CituWebAutoConfiguration.java

@@ -58,6 +58,7 @@ public class CituWebAutoConfiguration implements WebMvcConfigurer {
     public void configurePathMatch(PathMatchConfigurer configurer) {
         configurePathMatch(configurer, webProperties.getAdminApi());
         configurePathMatch(configurer, webProperties.getAppApi());
+        configurePathMatch(configurer, webProperties.getAppAdminApi());
     }
 
     /**

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/WebProperties.java

@@ -20,6 +20,8 @@ public class WebProperties {
     private Api appApi = new Api("/app-api", "**.controller.app.**");
     @NotNull(message = "Admin API 不能为空")
     private Api adminApi = new Api("/admin-api", "**.controller.admin.**");
+    @NotNull(message = "APP Admin API 不能为空")
+    private Api appAdminApi = new Api("/app-admin-api", "**.controller.appadmin.**");
 
     @NotNull(message = "Admin UI 不能为空")
     private Ui adminUi;

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/filter/ApiRequestFilter.java

@@ -21,7 +21,7 @@ public abstract class ApiRequestFilter extends OncePerRequestFilter {
     protected boolean shouldNotFilter(HttpServletRequest request) {
         // 只过滤 API 请求的地址
         return !StrUtil.startWithAny(request.getRequestURI(), webProperties.getAdminApi().getPrefix(),
-                webProperties.getAppApi().getPrefix());
+                webProperties.getAppApi().getPrefix(), webProperties.getAppAdminApi().getPrefix());
     }
 
 }

citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/util/WebFrameworkUtils.java

@@ -105,6 +105,9 @@ public class WebFrameworkUtils {
         if (request.getServletPath().startsWith(properties.getAppApi().getPrefix())) {
             return UserTypeEnum.MEMBER.getValue();
         }
+        if (request.getServletPath().startsWith(properties.getAppAdminApi().getPrefix())) {
+            return UserTypeEnum.MEMBER_ADMIN.getValue();
+        }
         return null;
     }
 

citu-module-system/citu-module-system-api/src/main/java/com/citu/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 @Schema(description = "RPC 服务 - OAuth2 访问令牌创建 Request DTO")
 @Data
@@ -29,4 +30,7 @@ public class OAuth2AccessTokenCreateReqDTO implements Serializable {
     @Schema(description = "授权范围的数组", example = "user_info")
     private List<String> scopes;
 
+    @Schema(description = "携带的用户信息", example = "user_info")
+    private Map<String, String> userInfo;
+
 }

citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/api/oauth2/OAuth2TokenApiImpl.java

@@ -1,5 +1,6 @@
 package com.citu.module.system.api.oauth2;
 
+import cn.hutool.core.map.MapUtil;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
@@ -25,11 +26,17 @@ public class OAuth2TokenApiImpl implements OAuth2TokenApi {
     @Override
     @Operation(description = "创建访问令牌")
     public CommonResult<OAuth2AccessTokenRespDTO> createAccessToken(OAuth2AccessTokenCreateReqDTO reqDTO) {
-        OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(
-                reqDTO.getUserId(), reqDTO.getUserType(), reqDTO.getClientId(), reqDTO.getScopes());
+        OAuth2AccessTokenDO accessTokenDO = null;
+        if (MapUtil.isEmpty(reqDTO.getUserInfo())) {
+            accessTokenDO = oauth2TokenService.createAccessToken(
+                    reqDTO.getUserId(), reqDTO.getUserType(), reqDTO.getClientId(), reqDTO.getScopes());
+        } else {
+            accessTokenDO = oauth2TokenService.createAccessToken(reqDTO);
+        }
         return success(BeanUtils.toBean(accessTokenDO, OAuth2AccessTokenRespDTO.class));
     }
 
+
     @Override
     public CommonResult<OAuth2AccessTokenCheckRespDTO> checkAccessToken(String accessToken) {
         OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.checkAccessToken(accessToken);

citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/service/oauth2/OAuth2TokenService.java

@@ -1,6 +1,7 @@
 package com.citu.module.system.service.oauth2;
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
 import com.citu.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO;
 import com.citu.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 
@@ -29,6 +30,14 @@ public interface OAuth2TokenService {
      */
     OAuth2AccessTokenDO createAccessToken(Long userId, Integer userType, String clientId, List<String> scopes);
 
+    /**
+     * 创建访问令牌
+     * 注意：该流程中，会包含创建刷新令牌的创建
+     *
+     * 参考 DefaultTokenServices 的 createAccessToken 方法
+     * @return 访问令牌的信息
+     */
+    OAuth2AccessTokenDO createAccessToken(OAuth2AccessTokenCreateReqDTO reqDTO);
     /**
      * 刷新访问令牌
      *

citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/service/oauth2/OAuth2TokenServiceImpl.java

@@ -11,6 +11,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.date.DateUtils;
 import com.citu.framework.security.core.LoginUser;
 import com.citu.framework.tenant.core.context.TenantContextHolder;
+import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
 import com.citu.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO;
 import com.citu.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import com.citu.module.system.dal.dataobject.oauth2.OAuth2ClientDO;
@@ -55,6 +56,14 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     @Lazy // 懒加载，避免循环依赖
     private AdminUserService adminUserService;
 
+    private static String generateAccessToken() {
+        return IdUtil.fastSimpleUUID();
+    }
+
+    private static String generateRefreshToken() {
+        return IdUtil.fastSimpleUUID();
+    }
+
     @Override
     @Transactional
     public OAuth2AccessTokenDO createAccessToken(Long userId, Integer userType, String clientId, List<String> scopes) {
@@ -65,6 +74,17 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
         return createOAuth2AccessToken(refreshTokenDO, clientDO);
     }
 
+    @Override
+    @Transactional
+    public OAuth2AccessTokenDO createAccessToken(OAuth2AccessTokenCreateReqDTO reqDTO) {
+        OAuth2ClientDO clientDO = oauth2ClientService.validOAuthClientFromCache(reqDTO.getClientId());
+        // 创建刷新令牌
+        OAuth2RefreshTokenDO refreshTokenDO = createOAuth2RefreshToken(
+                reqDTO.getUserId(), reqDTO.getUserType(), clientDO, reqDTO.getScopes());
+        // 创建访问令牌
+        return createOAuth2AccessToken2(refreshTokenDO, clientDO, reqDTO.getUserInfo());
+    }
+
     @Override
     public OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId) {
         // 查询访问令牌
@@ -147,7 +167,23 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     private OAuth2AccessTokenDO createOAuth2AccessToken(OAuth2RefreshTokenDO refreshTokenDO, OAuth2ClientDO clientDO) {
         OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
                 .setUserId(refreshTokenDO.getUserId()).setUserType(refreshTokenDO.getUserType())
-                .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType()))
+                .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType(),null))
+                .setClientId(clientDO.getClientId()).setScopes(refreshTokenDO.getScopes())
+                .setRefreshToken(refreshTokenDO.getRefreshToken())
+                .setExpiresTime(LocalDateTime.now().plusSeconds(clientDO.getAccessTokenValiditySeconds()));
+        accessTokenDO.setTenantId(TenantContextHolder.getTenantId()); // 手动设置租户编号，避免缓存到 Redis 的时候，无对应的租户编号
+        oauth2AccessTokenMapper.insert(accessTokenDO);
+        // 记录到 Redis 中
+        oauth2AccessTokenRedisDAO.set(accessTokenDO);
+        return accessTokenDO;
+    }
+
+    private OAuth2AccessTokenDO createOAuth2AccessToken2(OAuth2RefreshTokenDO refreshTokenDO,
+                                                         OAuth2ClientDO clientDO,
+                                                         Map<String, String> userInfo) {
+        OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
+                .setUserId(refreshTokenDO.getUserId()).setUserType(refreshTokenDO.getUserType())
+                .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType(), userInfo))
                 .setClientId(clientDO.getClientId()).setScopes(refreshTokenDO.getScopes())
                 .setRefreshToken(refreshTokenDO.getRefreshToken())
                 .setExpiresTime(LocalDateTime.now().plusSeconds(clientDO.getAccessTokenValiditySeconds()));
@@ -170,11 +206,11 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     /**
      * 加载用户信息，方便 {@link com.citu.framework.security.core.LoginUser} 获取到昵称、部门等信息
      *
-     * @param userId 用户编号
+     * @param userId   用户编号
      * @param userType 用户类型
      * @return 用户信息
      */
-    private Map<String, String> buildUserInfo(Long userId, Integer userType) {
+    private Map<String, String> buildUserInfo(Long userId, Integer userType, Map<String, String> userInfo) {
         if (userType.equals(UserTypeEnum.ADMIN.getValue())) {
             AdminUserDO user = adminUserService.getUser(userId);
             return MapUtil.builder(LoginUser.INFO_KEY_NICKNAME, user.getNickname())
@@ -182,16 +218,14 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
         } else if (userType.equals(UserTypeEnum.MEMBER.getValue())) {
             // 注意：目前 Member 暂时不读取，可以按需实现
             return Collections.emptyMap();
+        } else if (userType.equals(UserTypeEnum.MEMBER_ADMIN.getValue())) {
+            if (MapUtil.isNotEmpty(userInfo)) {
+                return MapUtil.builder(userInfo).build();
+            } else {
+                return Collections.emptyMap();
+            }
         }
         return null;
     }
 
-    private static String generateAccessToken() {
-        return IdUtil.fastSimpleUUID();
-    }
-
-    private static String generateRefreshToken() {
-        return IdUtil.fastSimpleUUID();
-    }
-
 }

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

@@ -10,15 +10,15 @@ public enum MdeDefaultRoleEnum {
     /**
      * 内置角色
      */
-    MENDUNER_DEFAULT_ROLE("MENDUNER_DEFAULT_ROLE"),
+    MENDUNER_DEFAULT_ROLE("menduner_default_role"),
     /**
      * 企业管理员
      */
-    MENDUNER_ENTERPRISE_ROLE("MENDUNER_ENTERPRISE_ROLE"),
+    MENDUNER_ENTERPRISE_ROLE("menduner_enterprise_role"),
     /**
      * 企业用户
      */
-    MENDUNER_ENTERPRISE_USER_ROLE("MENDUNER_ENTERPRISE_USER_ROLE");
+    MENDUNER_ENTERPRISE_USER_ROLE("menduner_enterprise_user_role");
 
     private final String type;
 

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

@@ -1,12 +1,9 @@
 package com.citu.module.menduner.system.config.permission;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.system.api.permission.MendunerPermissionApi;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 import java.util.List;
 
@@ -15,9 +12,9 @@ import java.util.List;
  *
  * @author Rayson
  */
-@AutoConfiguration
-@ConditionalOnClass(LoginUser.class)
-@ConditionalOnBean(value = CustomDataPermissionRuleCustomizer.class)
+@Configuration
+//@ConditionalOnClass(LoginUser.class)
+//@ConditionalOnBean(value = CustomDataPermissionRuleCustomizer.class)
 public class CustomDataPermissionAutoConfiguration {
 
     @Bean

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

@@ -74,13 +74,13 @@ public class CustomDataPermissionRule implements DataPermissionRule {
 
     @Override
     public Expression getExpression(String tableName, Alias tableAlias) {
-        // 只有有登陆用户的情况下，才进行数据权限的处理
+        // 只有登陆用户的情况下，才进行数据权限的处理
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         if (loginUser == null) {
             return null;
         }
-        // 只有管理员类型的用户，才进行数据权限的处理
-        if (ObjectUtil.notEqual(loginUser.getUserType(), UserTypeEnum.ADMIN.getValue())) {
+        // 只有MEMBER_ADMIN类型的用户，才进行数据权限的处理
+        if (ObjectUtil.notEqual(loginUser.getUserType(), UserTypeEnum.MEMBER_ADMIN.getValue())) {
             return null;
         }
         // 获得数据权限
@@ -124,7 +124,7 @@ public class CustomDataPermissionRule implements DataPermissionRule {
         if (userExpression == null) {
             return dataExpression;
         }
-        // 目前，如果有指定数据 + 可查看自己，采用 OR 条件。即，WHERE (shop_id IN ? OR user_id = ?)
+        // 目前，如果有指定数据 + 可查看自己，采用 OR 条件。即，WHERE (xx_id IN ? OR user_id = ?)
         return new Parenthesis(new OrExpression(dataExpression, userExpression));
     }
 
@@ -173,7 +173,7 @@ public class CustomDataPermissionRule implements DataPermissionRule {
 
     public void addUserColumn(Class<? extends BaseDO> entityClass, String columnName) {
         String tableName = TableInfoHelper.getTableInfo(entityClass).getTableName();
-        addDataColumn(tableName, columnName);
+        addUserColumn(tableName, columnName);
     }
 
     public void addUserColumn(String tableName, String columnName) {

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

@@ -6,11 +6,8 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.config.SecurityProperties;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.menduner.system.controller.app.auth.vo.*;
-import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthLoginReqVO;
-import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthSmsLoginReqVO;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.service.auth.MdeAuthService;
-import com.citu.module.menduner.system.service.auth.MdeEnterpriseAuthService;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
@@ -44,8 +41,6 @@ public class AppMdeAuthController {
     @Resource
     private SecurityProperties securityProperties;
 
-    @Resource
-    private MdeEnterpriseAuthService enterpriseAuthService;
 
     @PostMapping("/login")
     @Operation(summary = "使用手机 + 密码登录")
@@ -127,20 +122,5 @@ public class AppMdeAuthController {
         return success(MdeAuthConvert.INSTANCE.convert(signature));
     }
 
-    // ========== 企业登录相关 ==========
-    @PostMapping("/enterprise/login")
-    @Operation(summary = "企业-使用手机 + 密码登录")
-    public CommonResult<AppMdeAuthLoginRespVO> login(@RequestBody @Valid AppEnterpriseAuthLoginReqVO reqVO) {
-        return success(enterpriseAuthService.loginEnterprise(reqVO));
-    }
-
-    // ========== 短信登录相关 ==========
-
-    @PostMapping("/enterprise/sms-login")
-    @Operation(summary = "企业-使用手机 + 验证码登录")
-    public CommonResult<AppMdeAuthLoginRespVO> smsLogin(@RequestBody @Valid AppEnterpriseAuthSmsLoginReqVO reqVO) {
-        return success(enterpriseAuthService.smsLoginEnterprise(reqVO));
-    }
-
 
 }

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

@@ -31,7 +31,7 @@ public class AppEnterpriseController {
     private EnterpriseService enterpriseService;
 
     @PostMapping("/click")
-    @Operation(summary = "点击访问职位埋点")
+    @Operation(summary = "点击访问企业埋点")
     public CommonResult<Boolean> click(@RequestBody @Valid AppEnterpriseClickReqVO reqVO) {
         enterpriseService.click(reqVO);
         return success(true);

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

@@ -0,0 +1,51 @@
+package com.citu.module.menduner.system.controller.appadmin.auth;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.service.auth.MdeEnterpriseAuthService;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "招聘端 - 企业用户登录")
+@RestController
+@RequestMapping("/menduner/system/enterprise/auth")
+@Validated
+@Slf4j
+public class AppAdminEnterpriseAuthController {
+
+    @Resource
+    private MdeEnterpriseAuthService enterpriseAuthService;
+
+
+    // ========== 企业登录相关 ==========
+    @PermitAll
+    @PostMapping("/login")
+    @Operation(summary = "企业-使用手机 + 密码登录")
+    public CommonResult<AppMdeAuthLoginRespVO> login(@RequestBody @Valid AppEnterpriseAuthLoginReqVO reqVO) {
+        return success(enterpriseAuthService.loginEnterprise(reqVO));
+    }
+
+    // ========== 短信登录相关 ==========
+
+    @PermitAll
+    @PostMapping("/sms-login")
+    @Operation(summary = "企业-使用手机 + 验证码登录")
+    public CommonResult<AppMdeAuthLoginRespVO> smsLogin(@RequestBody @Valid AppEnterpriseAuthSmsLoginReqVO reqVO) {
+        return success(enterpriseAuthService.smsLoginEnterprise(reqVO));
+    }
+
+}

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,8 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.appadmin.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,20 +16,30 @@ import java.util.List;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
-@Tag(name = "用户端 - 企业用户")
+@Tag(name = "招聘端 - 企业用户")
 @RestController
 @RequestMapping("/menduner/system/enterprise-user-bind")
 @Validated
-public class AppEnterpriseUserBindController {
+public class AppAdminEnterpriseUserBindController {
 
     @Resource
     private EnterpriseUserBindService enterpriseUserBindService;
 
 
-    @GetMapping("/get/user")
+    @GetMapping("/get/enterprise/list")
     @Operation(summary = "获取当前用户绑定的企业列表")
-    public CommonResult<List<AppEnterpriseUserBindRespVO>> getEnterpriseUserBindList() {
+    public CommonResult<List<AppAdminEnterpriseUserBindRespVO>> getEnterpriseUserBindList() {
         return success(enterpriseUserBindService.getEnterpriseUserBindList());
     }
 
+
+    @PreAuthenticated
+    @GetMapping("/get/user")
+    @Operation(summary = "获取当前登录的企业用户信息")
+    public CommonResult<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBind() {
+        return success(enterpriseUserBindService.getEnterpriseUserBind());
+    }
+
+
+
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.appadmin.enterprise.vo;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "menduner - 企业申请注册 Request VO")
 @Data
-public class AppEnterpriseRegisterRespVO {
+public class AppAdminEnterpriseRegisterRespVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9045")
     private Long id;

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

@@ -1,14 +1,13 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+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.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Schema(description = "menduner - 企业用户 Request VO")
 @Data
-public class AppEnterpriseUserApplyReqVO {
+public class AppAdminEnterpriseUserApplyReqVO {
 
 
     @Schema(description = "所属企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1420")

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

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

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseUserBindRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/enterprise/vo/AppAdminEnterpriseUserBindRespVO.java

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

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

@@ -0,0 +1,41 @@
+package com.citu.module.menduner.system.controller.appadmin.job;
+
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedPageReqVO;
+import com.citu.module.menduner.system.controller.admin.job.vo.JobAdvertisedRespVO;
+import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.service.job.JobAdvertisedService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "招聘端 - 门墩儿-招聘职位")
+@RestController
+@RequestMapping("/menduner/system/job-advertised")
+@Validated
+public class AppAdminJobAdvertisedController {
+
+    @Resource
+    private JobAdvertisedService jobAdvertisedService;
+
+
+    @GetMapping("/page")
+    @Operation(summary = "获得招聘职位分页")
+    public CommonResult<PageResult<JobAdvertisedRespVO>> getJobAdvertisedPage(@Valid JobAdvertisedPageReqVO pageReqVO) {
+        PageResult<JobAdvertisedDO> pageResult = jobAdvertisedService.getJobAdvertisedPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, JobAdvertisedRespVO.class));
+    }
+
+
+}

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

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

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

@@ -37,7 +37,9 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
     }
 
     default EnterpriseUserBindDO selectByUserId(Long userId) {
-        return selectOne(EnterpriseUserBindDO::getUserId, userId);
+        return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
+                .eqIfPresent(EnterpriseUserBindDO::getUserId, userId)
+                .eqIfPresent(EnterpriseUserBindDO::getStatus, MendunerStatusEnum.ENABLE.getStatus()));
     }
 
     default EnterpriseUserBindDO selectByEnterpriseIdAndUserId(Long enterpriseId, Long userId) {

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

@@ -2,6 +2,8 @@ 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.job.JobAdvertisedDO;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,6 +20,14 @@ public class DataPermissionConfiguration {
     public CustomDataPermissionRuleCustomizer customDataPermissionRuleCustomizer() {
         return rule -> {
             // 添加自定义的权限规则
+
+            // 招聘职位表 where user_id = xx and enterprise_id = xx
+            rule.addUserColumn(JobAdvertisedDO.class, "user_id");
+            rule.addDataColumn(JobAdvertisedDO.class, "enterprise_id");
+
+            // 企业用户绑定表 where user_id = xx and enterprise_id = xx
+//            rule.addUserColumn(EnterpriseUserBindDO.class, "user_id");
+//            rule.addDataColumn(EnterpriseUserBindDO.class, "enterprise_id");
         };
     }
 }

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

@@ -1,12 +1,14 @@
 package com.citu.module.menduner.system.service.auth;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 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.AppMdeAuthLoginReqVO;
 import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginRespVO;
 import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnterpriseAuthLoginReqVO;
@@ -14,16 +16,14 @@ import com.citu.module.menduner.system.controller.app.auth.vo.enterprise.AppEnte
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
 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.system.api.logger.LoginLogApi;
 import com.citu.module.system.api.logger.dto.LoginLogCreateReqDTO;
 import com.citu.module.system.api.oauth2.OAuth2TokenApi;
 import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
 import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO;
-import com.citu.module.system.api.sms.SmsCodeApi;
-import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.SocialUserApi;
 import com.citu.module.system.api.social.dto.SocialUserBindReqDTO;
 import com.citu.module.system.enums.logger.LoginLogTypeEnum;
@@ -39,7 +39,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
-
 import java.util.Objects;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -57,8 +56,6 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
 
 
-    @Resource
-    private EnterpriseUserBindService bindService;
     @Resource
     protected MdeUserService userService;
     @Resource
@@ -67,7 +64,6 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
     protected SocialUserApi socialUserApi;
     @Resource
     protected OAuth2TokenApi oauth2TokenApi;
-
     /**
      * 验证码的开关，默认为 true
      */
@@ -75,9 +71,10 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
     protected Boolean captchaEnable;
     @Resource
     protected Validator validator;
-
     @Resource
     protected CaptchaService captchaService;
+    @Resource
+    private EnterpriseUserBindMapper userBindMapper;
 
     @VisibleForTesting
     protected void validateCaptcha(AppMdeAuthLoginReqVO reqVO) {
@@ -104,7 +101,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
         // 校验验证码
         validateCaptcha(reqVO);
         // 使用手机 + 密码，进行登录。
-        MdeUserDO user = check(reqVO.getPhone(), reqVO.getPassword());
+        MdeUserDO user = check(reqVO.getEnterpriseId(),reqVO.getPhone(), reqVO.getPassword());
 
         // 如果 socialType 非空，说明需要绑定社交用户
         String openid = null;
@@ -114,7 +111,7 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
         }
 
         // 创建 Token 令牌，记录登录日志
-        return createTokenAfterLoginSuccess(user, reqVO.getPhone(), LoginLogTypeEnum.LOGIN_MOBILE, openid);
+        return createTokenAfterLoginSuccess(user, reqVO.getPhone(), LoginLogTypeEnum.LOGIN_MOBILE, openid, reqVO.getEnterpriseId());
     }
 
     @Override
@@ -136,11 +133,11 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
         }
 
         // 创建 Token 令牌，记录登录日志
-        return createTokenAfterLoginSuccess(user, reqVO.getPhone(), LoginLogTypeEnum.LOGIN_SMS, openid);
+        return createTokenAfterLoginSuccess(user, reqVO.getPhone(), LoginLogTypeEnum.LOGIN_SMS, openid, reqVO.getEnterpriseId());
     }
 
 
-    protected MdeUserDO check(String mobile, String password) {
+    protected MdeUserDO check(Long enterpriseId, String mobile, String password) {
         final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_MOBILE;
         // 校验账号是否存在
         MdeUserDO user = userService.getUserByPhone(mobile);
@@ -153,7 +150,10 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
             throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
         }
         // 查询绑定用户
-        EnterpriseUserBindDO bind = bindService.getEnterpriseUserBind(user.getId());
+        EnterpriseUserBindDO bind = userBindMapper.selectByEnterpriseIdAndUserId(
+                enterpriseId,
+                user.getId()
+        );
         if (null == bind) {
             createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
             throw exception(MDE_USER_ENTERPRISE_NOT_USER_NULL);
@@ -168,17 +168,19 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
 
 
     protected UserTypeEnum getUserType() {
-        return UserTypeEnum.ADMIN;
+        return UserTypeEnum.MEMBER_ADMIN;
     }
 
 
-    protected AppMdeAuthLoginRespVO createTokenAfterLoginSuccess(MdeUserDO user, String phone, LoginLogTypeEnum logType, String openid) {
+    protected AppMdeAuthLoginRespVO createTokenAfterLoginSuccess(MdeUserDO user, String phone, LoginLogTypeEnum logType, String openid, Long enterpriseId) {
         // 插入登陆日志
         createLoginLog(user.getId(), phone, logType, LoginResultEnum.SUCCESS);
         // 创建 Token 令牌
         OAuth2AccessTokenRespDTO accessTokenRespDTO = oauth2TokenApi.createAccessToken(new OAuth2AccessTokenCreateReqDTO()
                 .setUserId(user.getId()).setUserType(getUserType().getValue())
-                .setClientId(OAuth2ClientConstants.CLIENT_ID_MENDUNER)).getCheckedData();
+                .setClientId(OAuth2ClientConstants.CLIENT_ID_MENDUNER)
+                .setUserInfo(MapUtil.builder(LoginUser.INFO_KEY_DATA_ID, enterpriseId.toString()).build())
+        ).getCheckedData();
         // 构建返回结果
         return MdeAuthConvert.INSTANCE.convert(accessTokenRespDTO, openid);
     }

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

@@ -4,7 +4,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 
 import javax.validation.Valid;
@@ -70,8 +70,15 @@ public interface EnterpriseUserBindService {
      **/
     AppEnterpriseUserContactRespVO getEnterpriseUserContact(Long enterpriseId,Long userId);
 
+    // ========== 招聘端 ==========
+
     /**
      * 获取当前用户绑定的企业列表
      **/
-    List<AppEnterpriseUserBindRespVO> getEnterpriseUserBindList();
+    List<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBindList();
+
+    /**
+     * 获取当前登录用户绑定的企业
+     **/
+    AppAdminEnterpriseUserBindRespVO getEnterpriseUserBind();
 }

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

@@ -3,16 +3,18 @@ package com.citu.module.menduner.system.service.enterprise.bind;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.admin.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.controller.app.contact.AppEnterpriseUserContactRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -22,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 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.MDE_ENTERPRISE_USER_BIND_NOT_EXISTS;
 
@@ -112,14 +115,14 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     }
 
     @Override
-    public List<AppEnterpriseUserBindRespVO> getEnterpriseUserBindList() {
+    public List<AppAdminEnterpriseUserBindRespVO> getEnterpriseUserBindList() {
         List<EnterpriseUserBindDO> list = enterpriseUserBindMapper.selectListByUserId(getLoginUserId());
         if (null == list) {
             return null;
         }
-        List<AppEnterpriseUserBindRespVO> respList = new ArrayList<>();
+        List<AppAdminEnterpriseUserBindRespVO> respList = new ArrayList<>();
         for (EnterpriseUserBindDO userBindDO : list) {
-            AppEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
+            AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
             EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
             if (null != enterprise) {
                 resp.setEnterpriseId(enterprise.getId());
@@ -129,4 +132,23 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         }
         return respList;
     }
+
+    @Override
+    public AppAdminEnterpriseUserBindRespVO getEnterpriseUserBind() {
+        LoginUser loginUser = getLoginUser();
+        EnterpriseUserBindDO userBindDO = enterpriseUserBindMapper
+                .selectByEnterpriseIdAndUserId(loginUser.getId(),
+                        Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID)));
+        if (null == userBindDO) {
+            throw exception(MDE_ENTERPRISE_USER_BIND_NOT_EXISTS);
+        }
+
+        AppAdminEnterpriseUserBindRespVO resp = EnterpriseConvert.INSTANCE.convert7(userBindDO);
+        EnterpriseDO enterprise = enterpriseMapper.selectById(userBindDO.getEnterpriseId());
+        if (null != enterprise) {
+            resp.setEnterpriseId(enterprise.getId());
+            resp.setEnterpriseName(enterprise.getName());
+        }
+        return resp;
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -187,6 +187,7 @@ public class MdePermissionServiceImpl implements MdePermissionService {
         return convertSet(mdeUserRoleMapper.selectListByUserId(userId), MdeUserRoleDO::getRoleId);
     }
 
+
     @Override
     @Cacheable(value = RedisKeyConstants.MDE_USER_ROLE_ID_LIST, key = "#userId")
     public Set<Long> getUserRoleIdListByUserIdFromCache(Long userId) {