zcloud_gbs
/
zcloud_gbs_edu
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(study): 优化班级查询的数据库关联结构

dev
zhaokai 2026-03-09 14:52:35 +08:00
parent 8152e943a3
commit 3809cc1a48
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-app/src/main/java/com/zcloud/edu/command/query/resource/CurriculumQueryExe.java
View File

@ -77,12 +77,12 @@ public class CurriculumQueryExe {
//如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人 //如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人
Boolean isCorpAccount = corpInfoRepository.checkCorp(); Boolean isCorpAccount = corpInfoRepository.checkCorp();
// 企业账户：检查租户ID匹配 // 企业账户：检查租户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); videoCoursewareCO.setIsUserCreate(true);
return; return;
} }
// 个人账户：检查创建者ID匹配 // 个人账户：检查创建者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); videoCoursewareCO.setIsUserCreate(true);
} }
}); });

4
web-app/src/main/java/com/zcloud/edu/command/query/resource/ExamPaperQueryExe.java
View File

@ -68,13 +68,13 @@ public class ExamPaperQueryExe {
Boolean isCorpAccount = corpInfoRepository.checkCorp(); Boolean isCorpAccount = corpInfoRepository.checkCorp();
// 企业账户：检查租户ID匹配 // 企业账户：检查租户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); videoCoursewareCO.setIsUserCreate(true);
return; return;
} }
// 个人账户：检查创建者ID匹配 // 个人账户：检查创建者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); videoCoursewareCO.setIsUserCreate(true);
} }

4
web-app/src/main/java/com/zcloud/edu/command/query/resource/VideoCoursewareQueryExe.java
View File

@ -76,7 +76,7 @@ public class VideoCoursewareQueryExe {
log.info("当前用户configinfoId:{}", videoCoursewareCO.getCorpinfoId()); log.info("当前用户configinfoId:{}", videoCoursewareCO.getCorpinfoId());
// 企业账户：检查租户ID匹配 ，获取权限是体液主账号 // 企业账户：检查租户ID匹配 ，获取权限是体液主账号
log.info("企业判断:{}",(isCorpAccount) && AuthContext.getTenantId().equals(videoCoursewareCO.getCorpinfoId())); 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); videoCoursewareCO.setIsUserCreate(true);
return; return;
} }
@ -85,7 +85,7 @@ public class VideoCoursewareQueryExe {
log.info("个人判断:{}",(videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())||(AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L)))); 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("个人判断:{}",((AuthContext.getRoleIds()!=null && AuthContext.getRoleIds().contains(2008483105201106946L))) );
log.info("个人判断:{}",videoCoursewareCO.getCreateId().equals(AuthContext.getUserId())); 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); videoCoursewareCO.setIsUserCreate(true);
return; return;
} }

4
web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java
View File

@ -89,11 +89,11 @@ public class ClassQueryExe {
examCenterCOS.stream().forEach(classCO -> { examCenterCOS.stream().forEach(classCO -> {
//如果是教师，只能维护本人创建的数据， //如果是教师，只能维护本人创建的数据，
// 企业账户：检查租户ID匹配 // 企业账户：检查租户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); classCO.setIsUserCreate(true);
} }
// 个人账户：检查创建者ID匹配 // 个人账户：检查创建者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); classCO.setIsUserCreate(true);
} }

4
web-app/src/main/java/com/zcloud/edu/command/resource/CurriculumUpdateExe.java
View File

@ -148,11 +148,11 @@ public class CurriculumUpdateExe {
//如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人 //如果是企业，可以看本企业下所有的，如果是个人，只能看个人的，判断登录的账号是企业主账号还是个人
Boolean isCorpAccount = corpInfoRepository.checkCorp(); Boolean isCorpAccount = corpInfoRepository.checkCorp();
// 企业账户：检查租户ID匹配 // 企业账户：检查租户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()+"课程不是本企业的"); errorList.add(curriculumDO.getCurriculumName()+"课程不是本企业的");
} }
// 个人账户：检查创建者ID匹配 // 个人账户：检查创建者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()+"课程不是本人创建的"); errorList.add(curriculumDO.getCurriculumName()+"课程不是本人创建的");
} }

2
web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java
View File

@ -42,7 +42,7 @@ public class ClassDO extends BaseDO {
private String trainType; private String trainType;
//培训行业类型名称 //培训行业类型名称
@ApiModelProperty(value = "培训行业类型名称") @ApiModelProperty(value = "培训行业类型名称")
@TableField(exist = false) // @TableField(exist = false)
private String trainTypeName; private String trainTypeName;
//培训地点 //培训地点
@ApiModelProperty(value = "培训地点") @ApiModelProperty(value = "培训地点")