diff --git a/src/main/java/com/newyetai/recruit/company/controller/HrCompanyController.java b/src/main/java/com/newyetai/recruit/company/controller/HrCompanyController.java index ecef7a4..a9c0504 100644 --- a/src/main/java/com/newyetai/recruit/company/controller/HrCompanyController.java +++ b/src/main/java/com/newyetai/recruit/company/controller/HrCompanyController.java @@ -2,6 +2,9 @@ package com.newyetai.recruit.company.controller; import com.newyetai.common.AlitaResult; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; import com.newyetai.common.validation.Create; import com.newyetai.common.validation.Update; import com.newyetai.recruit.company.dto.HrCompanyDTO; @@ -10,6 +13,7 @@ import com.newyetai.recruit.company.entity.HrCompany; import com.newyetai.recruit.company.service.IHrCompanyService; import com.newyetai.tkmybatis.pojo.Page; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -71,6 +75,9 @@ public class HrCompanyController { @GetMapping("/page") @ApiOperation("分页查询") public AlitaResult> page(@Validated HrCompanyPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } queryDTO.check(); companyService.page(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); @@ -105,6 +112,10 @@ public class HrCompanyController { @GetMapping("/audit_page") @ApiOperation("分页查询") public AlitaResult> auditPage(@Validated HrCompanyPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } + queryDTO.check(); companyService.auditPage(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); diff --git a/src/main/java/com/newyetai/recruit/company/service/impl/HrCompanyServiceImpl.java b/src/main/java/com/newyetai/recruit/company/service/impl/HrCompanyServiceImpl.java index f922c65..287f204 100644 --- a/src/main/java/com/newyetai/recruit/company/service/impl/HrCompanyServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/company/service/impl/HrCompanyServiceImpl.java @@ -116,7 +116,6 @@ public class HrCompanyServiceImpl implements IHrCompanyService { public List page(HrCompanyPageQueryDTO pageQueryDTO) { if (pageQueryDTO.getOrgId() == null) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); pageQueryDTO.setOrgId(UserContextHolder.getLoginOrgId()); } } @@ -248,7 +247,6 @@ public class HrCompanyServiceImpl implements IHrCompanyService { public List auditPage(HrCompanyPageQueryDTO pageQueryDTO) { if (pageQueryDTO.getOrgId() == null) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); pageQueryDTO.setOrgId(UserContextHolder.getLoginOrgId()); } } diff --git a/src/main/java/com/newyetai/recruit/position/controller/PositionAddressController.java b/src/main/java/com/newyetai/recruit/position/controller/PositionAddressController.java index d2bbf8a..f32d034 100644 --- a/src/main/java/com/newyetai/recruit/position/controller/PositionAddressController.java +++ b/src/main/java/com/newyetai/recruit/position/controller/PositionAddressController.java @@ -2,11 +2,15 @@ package com.newyetai.recruit.position.controller; import com.newyetai.common.AlitaResult; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; import com.newyetai.recruit.position.dto.PositionAddressDTO; import com.newyetai.recruit.position.dto.PositionAddressOperatorDTO; import com.newyetai.recruit.position.dto.PositionAddressQueryDTO; import com.newyetai.recruit.position.service.PositionAddressService; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -53,6 +57,9 @@ public class PositionAddressController { @GetMapping("/list") @ApiOperation("岗位地址列表") public AlitaResult> positionList(PositionAddressQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } return AlitaResult.success(positionAddressService.list(queryDTO)); } diff --git a/src/main/java/com/newyetai/recruit/position/controller/PositionAuditController.java b/src/main/java/com/newyetai/recruit/position/controller/PositionAuditController.java index 79bc69c..1641751 100644 --- a/src/main/java/com/newyetai/recruit/position/controller/PositionAuditController.java +++ b/src/main/java/com/newyetai/recruit/position/controller/PositionAuditController.java @@ -1,6 +1,10 @@ package com.newyetai.recruit.position.controller; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; import com.newyetai.recruit.position.entity.PositionAudit; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,6 +63,9 @@ public class PositionAuditController { @GetMapping("/position_page") @ApiOperation("岗位-分页查询") public AlitaResult> positionPage(PositionNewPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } positionAuditService.positionPage(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); } diff --git a/src/main/java/com/newyetai/recruit/position/controller/PositionController.java b/src/main/java/com/newyetai/recruit/position/controller/PositionController.java index 20c8bd6..9e81b85 100644 --- a/src/main/java/com/newyetai/recruit/position/controller/PositionController.java +++ b/src/main/java/com/newyetai/recruit/position/controller/PositionController.java @@ -1,5 +1,9 @@ package com.newyetai.recruit.position.controller; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -61,6 +65,9 @@ public class PositionController { @GetMapping("/page") @ApiOperation("岗位信息表;岗位信息表-分页查询") public AlitaResult> page(PositionPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } positionService.page(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); } diff --git a/src/main/java/com/newyetai/recruit/position/controller/PositionRegistrationController.java b/src/main/java/com/newyetai/recruit/position/controller/PositionRegistrationController.java index 68f4417..cd5dc4f 100644 --- a/src/main/java/com/newyetai/recruit/position/controller/PositionRegistrationController.java +++ b/src/main/java/com/newyetai/recruit/position/controller/PositionRegistrationController.java @@ -1,5 +1,9 @@ package com.newyetai.recruit.position.controller; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -78,6 +82,9 @@ public class PositionRegistrationController { @GetMapping("/page") @ApiOperation("岗位报名信息表-分页查询") public AlitaResult> page(PositionRegistrationPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } positionRegistrationService.page(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); } diff --git a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java index 9773066..5db27a0 100644 --- a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java @@ -66,7 +66,6 @@ public class PositionAddressServiceImpl implements PositionAddressService { @Override public List list(PositionAddressQueryDTO queryDTO) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); queryDTO.setOrgId(UserContextHolder.getLoginOrgId()); } diff --git a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAuditServiceImpl.java b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAuditServiceImpl.java index 9390d58..dae8823 100644 --- a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAuditServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAuditServiceImpl.java @@ -295,7 +295,6 @@ public class PositionAuditServiceImpl implements PositionAuditService { @Override public List positionPage(PositionNewPageQueryDTO queryDTO) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); queryDTO.setOrgId(UserContextHolder.getExistLoginOrgId()); } List list = positionAuditMapper.positionPage(queryDTO); diff --git a/src/main/java/com/newyetai/recruit/position/service/impl/PositionRegistrationServiceImpl.java b/src/main/java/com/newyetai/recruit/position/service/impl/PositionRegistrationServiceImpl.java index 54cbe10..f869dcd 100644 --- a/src/main/java/com/newyetai/recruit/position/service/impl/PositionRegistrationServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/position/service/impl/PositionRegistrationServiceImpl.java @@ -229,7 +229,6 @@ public class PositionRegistrationServiceImpl implements PositionRegistrationServ //查自己和下级机构 queryDTO.setOrgIds(orgService.childrenOrgIdList(UserContextHolder.getExistLoginOrgId())); } else { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); queryDTO.setOrgId(UserContextHolder.getExistLoginOrgId()); } } diff --git a/src/main/java/com/newyetai/recruit/position/service/impl/PositionServiceImpl.java b/src/main/java/com/newyetai/recruit/position/service/impl/PositionServiceImpl.java index 0f2c9dc..9cf0365 100644 --- a/src/main/java/com/newyetai/recruit/position/service/impl/PositionServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/position/service/impl/PositionServiceImpl.java @@ -264,7 +264,6 @@ public class PositionServiceImpl implements PositionService { @Override public List page(PositionPageQueryDTO queryDTO) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); queryDTO.setOrgId(UserContextHolder.getExistLoginOrgId()); } List list = positionMapper.page(queryDTO); diff --git a/src/main/java/com/newyetai/recruit/talent/controller/TalentController.java b/src/main/java/com/newyetai/recruit/talent/controller/TalentController.java index 68746bd..dc87501 100644 --- a/src/main/java/com/newyetai/recruit/talent/controller/TalentController.java +++ b/src/main/java/com/newyetai/recruit/talent/controller/TalentController.java @@ -1,5 +1,9 @@ package com.newyetai.recruit.talent.controller; +import com.newyetai.common.constant.CommonConstants; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.UserContextHolder; +import com.newyetai.usercenter.user.constant.UserTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -61,6 +65,9 @@ public class TalentController { @GetMapping("/page") @ApiOperation("人才库-分页查询") public AlitaResult> page(TalentPageQueryDTO queryDTO) { + if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { + Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); + } talentService.page(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); } diff --git a/src/main/java/com/newyetai/recruit/talent/service/impl/TalentServiceImpl.java b/src/main/java/com/newyetai/recruit/talent/service/impl/TalentServiceImpl.java index 1f242a5..26119c4 100644 --- a/src/main/java/com/newyetai/recruit/talent/service/impl/TalentServiceImpl.java +++ b/src/main/java/com/newyetai/recruit/talent/service/impl/TalentServiceImpl.java @@ -175,7 +175,6 @@ public class TalentServiceImpl implements TalentService { @Override public List page(TalentPageQueryDTO queryDTO) { if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) { - Assert.isTrue(!(UserTypeEnum.PERSON.getType().equals(UserContextHolder.getExistUserType())),"用户类型不匹配"); queryDTO.setOrgId(UserContextHolder.getExistLoginOrgId()); } return talentMapper.page(queryDTO);