diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/resource/CurriculumQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/resource/CurriculumQueryExe.java index 9ccb50c..f4c0cdb 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/resource/CurriculumQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/resource/CurriculumQueryExe.java @@ -77,12 +77,12 @@ public class CurriculumQueryExe { //如果是企业,可以看本企业下所有的,如果是个人,只能看个人的,判断登录的账号是企业主账号还是个人 Boolean isCorpAccount = corpInfoRepository.checkCorp(); // 企业账户:检查租户ID匹配 - if (isCorpAccount && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { + if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { videoCoursewareCO.setIsUserCreate(true); return; } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && (videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))) { + if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { videoCoursewareCO.setIsUserCreate(true); } }); diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/resource/ExamPaperQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/resource/ExamPaperQueryExe.java index 879f2db..41efcb8 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/resource/ExamPaperQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/resource/ExamPaperQueryExe.java @@ -68,13 +68,13 @@ public class ExamPaperQueryExe { Boolean isCorpAccount = corpInfoRepository.checkCorp(); // 企业账户:检查租户ID匹配 - if (isCorpAccount && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { + if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { videoCoursewareCO.setIsUserCreate(true); return; } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && (videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))) { + if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { videoCoursewareCO.setIsUserCreate(true); } diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/resource/VideoCoursewareQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/resource/VideoCoursewareQueryExe.java index b164d03..328259f 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/resource/VideoCoursewareQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/resource/VideoCoursewareQueryExe.java @@ -76,7 +76,7 @@ public class VideoCoursewareQueryExe { log.info("当前用户configinfoId:{}", videoCoursewareCO.getCorpinfoId()); // 企业账户:检查租户ID匹配 ,获取权限是体液主账号 log.info("企业判断:{}",(isCorpAccount) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())); - if ((isCorpAccount) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { + if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())) { videoCoursewareCO.setIsUserCreate(true); return; } @@ -85,7 +85,7 @@ public class VideoCoursewareQueryExe { log.info("个人判断:{}",(videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))); log.info("个人判断:{}",((AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) ); log.info("个人判断:{}",videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())); - if (!isCorpAccount && (videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))) { + if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { videoCoursewareCO.setIsUserCreate(true); return; } diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java index 8d771e1..a166314 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java @@ -89,11 +89,11 @@ public class ClassQueryExe { examCenterCOS.stream().forEach(classCO -> { //如果是教师,只能维护本人创建的数据, // 企业账户:检查租户ID匹配 - if (checkCorp && AuthContext.getTenantId().equals(classCO.getCorpinfoId())) { + if ((checkCorp || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(classCO.getCorpinfoId())) { classCO.setIsUserCreate(true); } // 个人账户:检查创建者ID匹配 - if (!checkCorp && ((teacherInfoByUserId != null && teacherInfoByUserId.getUserId().equals(classCO.getCreateId())) || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))) { + if (!checkCorp && (teacherInfoByUserId != null && teacherInfoByUserId.getUserId().equals(classCO.getCreateId()))) { classCO.setIsUserCreate(true); } diff --git a/web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java b/web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java index 65f4226..d3f9171 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java @@ -148,11 +148,11 @@ public class CurriculumUpdateExe { //如果是企业,可以看本企业下所有的,如果是个人,只能看个人的,判断登录的账号是企业主账号还是个人 Boolean isCorpAccount = corpInfoRepository.checkCorp(); // 企业账户:检查租户ID匹配 - if (isCorpAccount && !AuthContext.getTenantId().equals(curriculumDO.getCorpinfoId())) { + if ((isCorpAccount||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && AuthContext.getTenantId().equals(curriculumDO.getCorpinfoId())) { errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的"); } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && (curriculumDO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))) { + if (!isCorpAccount && curriculumDO.getCreateId().equals(AuthContext.getUserId())) { errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的"); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java index 8f92040..06e0a19 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java @@ -42,7 +42,7 @@ public class ClassDO extends BaseDO { private String trainType; //培训行业类型名称 @ApiModelProperty(value = "培训行业类型名称") - @TableField(exist = false) +// @TableField(exist = false) private String trainTypeName; //培训地点 @ApiModelProperty(value = "培训地点")