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

fix(study): 修复监管端企业ID过滤逻辑

dev_workchange
zhaokai 2026-06-26 10:55:06 +08:00
parent 61192a9d49
commit 47998fa054
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.dataobject.study.*;
import com.zcloud.edu.persistence.mapper.po.study.StudentExamCountPO; import com.zcloud.edu.persistence.mapper.po.study.StudentExamCountPO;
import com.zcloud.edu.persistence.mapper.po.study.StudentExamCountByCorpPO; 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.edu.persistence.repository.study.*;
import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.Tools;
@ -56,6 +57,7 @@ public class StudentQueryExe {
private final ClassCurriculumRepository classCurriculumRepository; private final ClassCurriculumRepository classCurriculumRepository;
private final ClassCurriculumChapterRepository classCurriculumChapterRepository; private final ClassCurriculumChapterRepository classCurriculumChapterRepository;
private final StudentSignRepository studentSignRepository; private final StudentSignRepository studentSignRepository;
private final CorpInfoRepository corpInfoRepository;
/** /**
* 分页 * 分页
@ -291,6 +293,11 @@ public class StudentQueryExe {
if (!Tools.isEmpty(params.get("likePhone"))) { if (!Tools.isEmpty(params.get("likePhone"))) {
params.put("phoneArr",String.valueOf(params.get("likePhone")).split(",")); params.put("phoneArr",String.valueOf(params.get("likePhone")).split(","));
} }
//如果当前企业是监管端，去掉企业id
boolean supper = corpInfoRepository.isSupper();
if (supper) {
params.remove("eqProjectCorpInfoId");
}
PageResponse<EducationUserCO> pageResponse = studentRepository.educationUserList(params); PageResponse<EducationUserCO> pageResponse = studentRepository.educationUserList(params);
return pageResponse; return pageResponse;
} }

10
web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
View File

@ -593,10 +593,16 @@
left join post po on u.post_id = po.id left join post po on u.post_id = po.id
left join training_user tu on tu.phone = u.phone 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 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
<if test="params.eqProjectCorpInfoId != null ">
and paf.corpinfo_id = #{params.eqProjectCorpInfoId} and paf.corpinfo_id = #{params.eqProjectCorpInfoId}
</if>
where where
tap.corpinfo_id = #{params.eqProjectCorpInfoId} <if test="params.eqProjectCorpInfoId != null ">
and tau.delete_enum = 'FALSE' tap.corpinfo_id = #{params.eqProjectCorpInfoId} and
</if>
tau.delete_enum = 'FALSE'
and tar.delete_enum = 'FALSE' and tar.delete_enum = 'FALSE'
and tau.apply_status = 2 and tau.apply_status = 2