Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Merge pull request '根据项目ID查询所属组织标识,取消权限拦截，手动注入上下文' (#876) from xxq250/microservices:master into master

This commit is contained in:
xxq250 2025-05-20 11:18:51 +08:00
parent 911aae3355 5dc02cdd33
commit 562469eccb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.constant.HttpStatus;
import com.microservices.common.core.constant.SecurityConstants;
import com.microservices.common.core.context.SecurityContextHolder;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.DateUtils;
@ -28,6 +29,7 @@ import com.microservices.pms.product.domain.vo.PmsProductSearchVo;
import com.microservices.pms.product.service.IPmsProductRequirementTagService;
import com.microservices.pms.product.service.IPmsProductService;
import com.microservices.pms.project.domain.PmsProject;
import com.microservices.pms.project.mapper.PmsProjectMapper;
import com.microservices.pms.project.service.IPmsProjectService;
import com.microservices.pms.utils.PmsConstants;
import com.microservices.pms.utils.PmsGitLinkRequestUrl;
@ -87,6 +89,8 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService {
private RedisService redisService;
@Value("${pms.pmsUrl}")
private String pmsUrl;
@Autowired
private PmsProjectMapper pmsProjectMapper;
/**
* 查询项目管理企业
@ -620,7 +624,11 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService {
@Override
public PmsEnterprise getEnterpriseByProjectId(Long projectId) {
PmsProject pmsProject = pmsProjectService.selectPmsProjectByIdNoCheckRole(projectId);
return pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId());
PmsProject pmsProject = pmsProjectMapper.selectPmsProjectById(projectId);
PmsEnterprise pmsEnterprise = pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId());
// // 手动注入上下文
// SecurityContextHolder.setDeptId(pmsEnterprise.getDeptId().toString());
// checkEnterpriseIsCurrentEnterprise(pmsEnterprise);
return pmsEnterprise;
}
}