Merge branch 'dev'
commit
20a5a3a4fc
|
|
@ -148,11 +148,11 @@ public class CurriculumUpdateExe {
|
||||||
//如果是企业,可以看本企业下所有的,如果是个人,只能看个人的,判断登录的账号是企业主账号还是个人
|
//如果是企业,可以看本企业下所有的,如果是个人,只能看个人的,判断登录的账号是企业主账号还是个人
|
||||||
Boolean isCorpAccount = corpInfoRepository.checkCorp();
|
Boolean isCorpAccount = corpInfoRepository.checkCorp();
|
||||||
// 企业账户:检查租户ID匹配
|
// 企业账户:检查租户ID匹配
|
||||||
if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(curriculumDO.getCorpinfoId())) {
|
if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && !AuthContext.getTenantId().equals(curriculumDO.getCorpinfoId())) {
|
||||||
errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的");
|
errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的");
|
||||||
}
|
}
|
||||||
// 个人账户:检查创建者ID匹配
|
// 个人账户:检查创建者ID匹配
|
||||||
if (!isCorpAccount && curriculumDO.getCreateId().equals(AuthContext.getUserId())) {
|
if (!isCorpAccount && !curriculumDO.getCreateId().equals(AuthContext.getUserId())) {
|
||||||
|
|
||||||
errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的");
|
errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue