From de8656638932eb96857e023c70b45de50a0382ef Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 9 Mar 2026 13:44:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(auth):=20=E4=BF=AE=E5=A4=8D=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E8=B4=A6=E6=88=B7=E6=9D=83=E9=99=90=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=A7=9F=E6=88=B7ID=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/command/query/resource/CurriculumQueryExe.java | 5 +++-- .../zcloud/edu/command/query/resource/ExamPaperQueryExe.java | 2 +- .../edu/command/query/resource/VideoCoursewareQueryExe.java | 2 +- .../com/zcloud/edu/command/query/study/ClassQueryExe.java | 4 ++-- .../com/zcloud/edu/command/resource/CurriculumUpdateExe.java | 5 +++-- 5 files changed, 10 insertions(+), 8 deletions(-) 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()+"课程不是本人创建的"); } }