diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java index 0abdbfb..e1204a4 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java @@ -28,6 +28,7 @@ import com.zcloud.edu.persistence.mapper.po.study.StudentCountByCorpPO; import com.zcloud.edu.persistence.dataobject.study.*; import com.zcloud.edu.persistence.mapper.po.study.StudentExamCountPO; import com.zcloud.edu.persistence.mapper.po.study.StudentExamCountByCorpPO; +import com.zcloud.edu.persistence.repository.resource.CorpInfoRepository; import com.zcloud.edu.persistence.repository.study.*; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; @@ -56,6 +57,7 @@ public class StudentQueryExe { private final ClassCurriculumRepository classCurriculumRepository; private final ClassCurriculumChapterRepository classCurriculumChapterRepository; private final StudentSignRepository studentSignRepository; + private final CorpInfoRepository corpInfoRepository; /** * 分页 @@ -291,6 +293,11 @@ public class StudentQueryExe { if (!Tools.isEmpty(params.get("likePhone"))) { params.put("phoneArr",String.valueOf(params.get("likePhone")).split(",")); } + //如果当前企业是监管端,去掉企业id + boolean supper = corpInfoRepository.isSupper(); + if (supper) { + params.remove("eqProjectCorpInfoId"); + } PageResponse pageResponse = studentRepository.educationUserList(params); return pageResponse; } diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index 0d41d5f..b800ba7 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -593,10 +593,16 @@ left join post po on u.post_id = po.id left join training_user tu on tu.phone = u.phone LEFT JOIN project_approval_flow paf on paf.project_id = p.id and paf.delete_enum = 'FALSE' and paf.audit_type = 2 and paf.approval_status = 2 - and paf.corpinfo_id = #{params.eqProjectCorpInfoId} + + and paf.corpinfo_id = #{params.eqProjectCorpInfoId} + + where - tap.corpinfo_id = #{params.eqProjectCorpInfoId} - and tau.delete_enum = 'FALSE' + + tap.corpinfo_id = #{params.eqProjectCorpInfoId} and + + + tau.delete_enum = 'FALSE' and tar.delete_enum = 'FALSE' and tau.apply_status = 2