From 683a6ec9a8af735622c15a1bb22a075216cba3f1 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Thu, 27 Aug 2026 09:23:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AEorgId=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ClassManagementServiceImpl.java | 3 +++ .../impl/CourseManagementServiceImpl.java | 3 +++ .../impl/CoursewareManagementServiceImpl.java | 3 +++ .../cedu/service/impl/PaperServiceImpl.java | 27 ++++++------------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java index dfa7b6ec..610d0e21 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java @@ -14,6 +14,7 @@ import org.qinan.cedu.model.query.ClassManagementPageQuery; import org.qinan.cedu.model.vo.ClassManagementVO; import org.qinan.cedu.model.vo.ClassStudentStatVO; import org.qinan.cedu.service.ClassManagementService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,12 +43,14 @@ public class ClassManagementServiceImpl extends ServiceImpl pageQuery(ClassManagementPageQuery query) { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); IPage page = this.lambdaQuery() .eq(ClassManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) .like(StringUtils.hasText(query.getClassCode()), ClassManagementDO::getClassCode, query.getClassCode()) .like(StringUtils.hasText(query.getClassName()), ClassManagementDO::getClassName, query.getClassName()) .eq(StringUtils.hasText(query.getTrainingType()), ClassManagementDO::getTrainingType, query.getTrainingType()) .eq(query.getStatus() != null, ClassManagementDO::getStatus, query.getStatus()) + .eq(orgId != null, ClassManagementDO::getOrgId, orgId) .ge(query.getStartDateBegin() != null, ClassManagementDO::getStartDate, query.getStartDateBegin()) .le(query.getEndDateEnd() != null, ClassManagementDO::getEndDate, query.getEndDateEnd()) .orderByDesc(ClassManagementDO::getCreateTime) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java index a74dfe72..5b7d6561 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java @@ -18,6 +18,7 @@ import org.qinan.cedu.model.entity.CourseRelCoursewareDO; import org.qinan.cedu.model.query.CourseManagementPageQuery; import org.qinan.cedu.model.vo.CourseManagementVO; import org.qinan.cedu.service.CourseManagementService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,11 +53,13 @@ public class CourseManagementServiceImpl extends ServiceImpl pageQuery(CourseManagementPageQuery query) { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); IPage page = this.lambdaQuery() .eq(CourseManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) .like(StringUtils.hasText(query.getCourseName()), CourseManagementDO::getCourseName, query.getCourseName()) .eq(query.getStatus() != null, CourseManagementDO::getStatus, query.getStatus()) .eq(query.getTrainingType() != null, CourseManagementDO::getTrainingType, query.getTrainingType()) + .eq(orgId != null, CourseManagementDO::getOrgId, orgId) .orderByDesc(CourseManagementDO::getCreateTime) .page(new Page<>(query.getCurrent(), query.getSize())); IPage convert = page.convert(courseManagementConvertor::convertEToVo); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java index 544a5388..12fe2292 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java @@ -14,6 +14,7 @@ import org.qinan.cedu.model.entity.CoursewareManagementDO; import org.qinan.cedu.model.entity.QuestionDO; import org.qinan.cedu.model.query.CoursewareManagementPageQuery; import org.qinan.cedu.service.CoursewareManagementService; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,11 +40,13 @@ public class CoursewareManagementServiceImpl extends ServiceImpl pageQuery(CoursewareManagementPageQuery query) { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); IPage page = this.lambdaQuery() .eq(CoursewareManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode()) .like(StringUtils.hasText(query.getCoursewareName()), CoursewareManagementDO::getCoursewareName, query.getCoursewareName()) .eq(query.getStatus() != null, CoursewareManagementDO::getStatus, query.getStatus()) .eq(query.getTrainingType() != null, CoursewareManagementDO::getTrainingType, query.getTrainingType()) + .eq(orgId != null, CoursewareManagementDO::getOrgId, orgId) .orderByDesc(CoursewareManagementDO::getCreateTime) .page(new Page<>(query.getCurrent(), query.getSize())); IPage convert = page.convert(coursewareManagementConvertor::convertEToVo); diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java index abcec674..a1914537 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java @@ -8,12 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.lowagie.text.Document; -import com.lowagie.text.DocumentException; -import com.lowagie.text.Element; -import com.lowagie.text.Font; -import com.lowagie.text.PageSize; -import com.lowagie.text.Paragraph; +import com.lowagie.text.*; import com.lowagie.text.pdf.BaseFont; import com.lowagie.text.pdf.PdfWriter; import lombok.RequiredArgsConstructor; @@ -28,25 +23,15 @@ import org.qinan.cedu.mapper.PaperMapper; import org.qinan.cedu.mapper.PaperQuestionRelMapper; import org.qinan.cedu.mapper.QuestionMapper; import org.qinan.cedu.mapper.QuestionOptionMapper; -import org.qinan.cedu.model.dto.PaperConfigRuleDTO; -import org.qinan.cedu.model.dto.PaperCopyDTO; -import org.qinan.cedu.model.dto.PaperCoursewareQuestionRuleDTO; -import org.qinan.cedu.model.dto.PaperImportDTO; -import org.qinan.cedu.model.dto.PaperOrgPageQueryDTO; -import org.qinan.cedu.model.dto.PaperPageQueryDTO; -import org.qinan.cedu.model.dto.PaperUpdateDTO; +import org.qinan.cedu.model.dto.*; import org.qinan.cedu.model.entity.PaperDO; import org.qinan.cedu.model.entity.PaperQuestionRelDO; import org.qinan.cedu.model.entity.QuestionDO; import org.qinan.cedu.model.entity.QuestionOptionDO; -import org.qinan.cedu.model.vo.PaperBasicInfoVO; -import org.qinan.cedu.model.vo.PaperExamInfoVO; -import org.qinan.cedu.model.vo.PaperImportVO; -import org.qinan.cedu.model.vo.PaperPageVO; -import org.qinan.cedu.model.vo.QuestionOptionVO; -import org.qinan.cedu.model.vo.QuestionVO; +import org.qinan.cedu.model.vo.*; import org.qinan.cedu.service.PaperService; import org.qinan.cedu.service.support.QuestionExcelImporter; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -60,6 +45,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; @@ -84,6 +70,7 @@ public class PaperServiceImpl extends ServiceImpl implemen @Override public IPage pageQuery(PaperPageQueryDTO query) { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(PaperDO::getDeleteEnum, DeleteEnum.FALSE.getCode()); if (StringUtils.hasText(query.getPaperName())) { @@ -97,6 +84,8 @@ public class PaperServiceImpl extends ServiceImpl implemen } if (StringUtils.hasText(query.getPaperType())) { wrapper.eq(PaperDO::getPaperType, query.getPaperType()); + }if (Objects.nonNull(orgId)) { + wrapper.eq(PaperDO::getOrgId, orgId); } wrapper.orderByDesc(PaperDO::getId); IPage page = this.page(new Page<>(query.getCurrent(), query.getSize()), wrapper); From affb0bbedde8948cedcdc6f68910e80c352a7224 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Thu, 27 Aug 2026 09:44:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E5=8F=82=E8=AE=AD=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/gatewayimpl/OrgInfoGatewayImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java index 0388c507..bfccb5d3 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java @@ -17,6 +17,7 @@ import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.OrgInfoGateway; import org.qinan.safetyeval.domain.query.OrgInfoQuery; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.qinan.safetyeval.infrastructure.adapter.gbs.GbsUserFacadeClient; import org.qinan.safetyeval.infrastructure.dataobject.AccountDO; @@ -250,6 +251,10 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { if (query.getFilingRecordStatusCode() != null) { wrapper.eq(OrgInfoDO::getFilingRecordStatusCode, query.getFilingRecordStatusCode()); } + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); + if (orgId != null) { + wrapper.eq(OrgInfoDO::getId, orgId); + } wrapper.orderByDesc(OrgInfoDO::getId); Page page = new Page<>(query.getPageNum(), query.getPageSize());