Merge remote-tracking branch 'origin/master'

heheng

2025-12-03 430477c7e0777531f22fc18dc8906ea75cdc21d9

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualityServiceImpl.java

@@ -49,13 +49,17 @@
        boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
        if (!SecurityUtils.adminUser()){
            if (quality.getCompanyId()==null){
                throw new RuntimeException("非管理员操作，查询条件不可为空");
                throw new ApiException("非管理员操作，查询条件不可为空");
            }
        }
        PageUtils.startPage();
        List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
        for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
            List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
            for (QualityTarget qualityTarget : qualityTargets) {
                List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
                qualityTarget.setQualityTargetMesses(qualityTargetMesses);
            }
            qualityTargetVo.setQualityTargets(qualityTargets);
        }
        return CommonPage.restPage(qualityTargetVos);
@@ -138,6 +142,10 @@
        List<QualityTargetVo> qualityTargetVos = qualityMapper.selectQualityTarget(quality);
        for (QualityTargetVo qualityTargetVo : qualityTargetVos) {
            List<QualityTarget> qualityTargets = qualityTargetMapper.selectByQualityId(qualityTargetVo.getId());
            for (QualityTarget qualityTarget : qualityTargets) {
                List<QualityTargetMess> qualityTargetMesses = qualityTargetMapper.selectBYQualityTargetId(qualityTarget.getId());
                qualityTarget.setQualityTargetMesses(qualityTargetMesses);
            }
            qualityTargetVo.setQualityTargets(qualityTargets);
        }
        return CommonResult.success(qualityTargetVos);