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

feat(项目管理功能完善): 完善企业用户相关逻辑 

由于成员可能会被移出企业，所以暂不校验用户是否在企业中
This commit is contained in:
OTTO 2024-03-05 10:50:46 +08:00
parent 572d313965
commit d1027d6f5d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,11 +399,13 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService {
*/ */
@Override @Override
public boolean checkUserInEnterprise(Long enterpriseId, Long userId) { public boolean checkUserInEnterprise(Long enterpriseId, Long userId) {
PmsEnterprise pmsEnterprise=selectPmsEnterpriseById(enterpriseId); // PmsEnterprise pmsEnterprise=selectPmsEnterpriseById(enterpriseId);
Boolean isExist = FeignUtils.getReturnData( // Boolean isExist = FeignUtils.getReturnData(
remoteDeptService.checkUserInDept(pmsEnterprise.getDeptId(), userId, SecurityConstants.INNER) // remoteDeptService.checkUserInDept(pmsEnterprise.getDeptId(), userId, SecurityConstants.INNER)
); // );
return isExist != null && isExist; // return isExist != null && isExist;
//TODO: 由于成员可能会被移出企业，所以暂不校验用户是否在企业中
return true;
} }
/** /**

10
ruoyi-modules/ruoyi-pms/src/main/java/com/ruoyi/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java
View File

@ -177,7 +177,7 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService
pmsProjectTestcase.setTypeId(defaultType.getId()); pmsProjectTestcase.setTypeId(defaultType.getId());
} }
checkAndSetDefaultTestcase(pmsProjectTestcase); checkAndSetDefaultTestcase(pmsProjectTestcase, null);
// 获取当前项目下测试用例的最大索引值 // 获取当前项目下测试用例的最大索引值
Long maxIndex = pmsProjectTestcaseMapper.selectPmsProjectTestcaseMaxIndexByProjectId(pmsProjectTestcase.getPmsProjectId()); Long maxIndex = pmsProjectTestcaseMapper.selectPmsProjectTestcaseMaxIndexByProjectId(pmsProjectTestcase.getPmsProjectId());
@ -198,12 +198,14 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService
* *
* @param pmsProjectTestcase 测试用例 * @param pmsProjectTestcase 测试用例
*/ */
private void checkAndSetDefaultTestcase(PmsProjectTestcase pmsProjectTestcase) { private void checkAndSetDefaultTestcase(PmsProjectTestcase pmsProjectTestcase, PmsProjectTestcase oldPmsProjectTestcase) {
PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(pmsProjectTestcase.getPmsProjectId()); PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(pmsProjectTestcase.getPmsProjectId());
if (pmsProjectTestcase.getAssigneeGitlinkId() != null) { if (pmsProjectTestcase.getAssigneeGitlinkId() != null) {
if (oldPmsProjectTestcase == null
|| !pmsProjectTestcase.getAssigneeGitlinkId().equals(oldPmsProjectTestcase.getAssigneeGitlinkId())) {
// 检查维护用户id是否正确 // 检查维护用户id是否正确
checkUserInEnterprise(pmsProjectTestcase.getAssigneeGitlinkId(), pmsProject); checkUserInEnterprise(pmsProjectTestcase.getAssigneeGitlinkId(), pmsProject);
}
} }
// 检查测试模块是否正确 // 检查测试模块是否正确
if (pmsProjectTestcase.getPmsModuleId() != null) { if (pmsProjectTestcase.getPmsModuleId() != null) {
@ -245,7 +247,7 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService
public int updatePmsProjectTestcase(PmsProjectTestcase pmsProjectTestcase) { public int updatePmsProjectTestcase(PmsProjectTestcase pmsProjectTestcase) {
PmsProjectTestcase oldPmsProjectTestcase = selectPmsProjectTestcaseById(pmsProjectTestcase.getId()); PmsProjectTestcase oldPmsProjectTestcase = selectPmsProjectTestcaseById(pmsProjectTestcase.getId());
pmsProjectTestcase.setPmsProjectId(oldPmsProjectTestcase.getPmsProjectId()); pmsProjectTestcase.setPmsProjectId(oldPmsProjectTestcase.getPmsProjectId());
checkAndSetDefaultTestcase(pmsProjectTestcase); checkAndSetDefaultTestcase(pmsProjectTestcase, oldPmsProjectTestcase);
pmsProjectTestcase.setUpdateBy(SecurityUtils.getUsername()); pmsProjectTestcase.setUpdateBy(SecurityUtils.getUsername());
pmsProjectTestcase.setUpdateTime(DateUtils.getNowDate()); pmsProjectTestcase.setUpdateTime(DateUtils.getNowDate());