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 406acaa..c3909ee 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 @@ -82,8 +82,9 @@ public class CurriculumQueryExe { return; } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { - videoCoursewareCO.setIsUserCreate(true); + if ((!isCorpAccount || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { + + videoCoursewareCO.setIsUserCreate(true); } }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); 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 98333de..2b4bca9 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 @@ -74,7 +74,7 @@ public class ExamPaperQueryExe { } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { + if ((!isCorpAccount || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && 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 ce61a32..1e73e1a 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 @@ -75,7 +75,7 @@ public class VideoCoursewareQueryExe { } // 个人账户:检查创建者ID匹配 - if ((!isCorpAccount || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains("2008483105201106946"))) && videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())) { + if ((!isCorpAccount || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && 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 4d66797..d7d2605 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 @@ -93,8 +93,8 @@ public class ClassQueryExe { classCO.setIsUserCreate(true); } // 个人账户:检查创建者ID匹配 - if (!checkCorp && (teacherInfoByUserId != null && teacherInfoByUserId.getUserId().equals(classCO.getCreateId()))) { - classCO.setIsUserCreate(true); + if ((!checkCorp ||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && (teacherInfoByUserId != null && teacherInfoByUserId.getUserId().equals(classCO.getCreateId()))) { + classCO.setIsUserCreate(true); } /* if(checkCorp || (teacherInfoByUserId != null && teacherInfoByUserId.getUserId().equals(classCO.getCreateId()))){ 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 78d0d5b..f1ee66e 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 @@ -152,8 +152,9 @@ public class CurriculumUpdateExe { errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的"); } // 个人账户:检查创建者ID匹配 - if (!isCorpAccount && !curriculumDO.getCreateId().equals(AuthContext.getUserId())) { - errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的"); + if ((!isCorpAccount || (AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) && curriculumDO.getCreateId().equals(AuthContext.getUserId())) { + + errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的"); } }