From 9b1168fb27b9c679bce59c86860ec3a522200433 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 2 Sep 2024 17:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E7=AB=AFbu?= =?UTF-8?q?g=20=EF=BC=8C=E6=B7=BB=E5=8A=A0system=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tea/TeaGradeManageController.java | 12 ++++++------ .../controller/tea/UserController.java | 4 ++-- .../financial_bigdata/mapper/StuClassMapper.java | 4 ++-- .../service/tea/impl/TeaGradeManageServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index 54fc3a7..77d26ae 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java @@ -81,8 +81,8 @@ public class TeaGradeManageController { @ApiParam("系统名称") @RequestParam String systemOwner) { List teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId, systemOwner); - if (teaExamManages.isEmpty()) { - return null; + if (teaExamManages == null || teaExamManages.isEmpty()) { + return new ResultEntity<>(new PageInfo<>()); } List teaExamManageCountDtos = new ArrayList<>(); Map userMap = new HashMap<>(); @@ -244,7 +244,7 @@ public class TeaGradeManageController { List list = Arrays.asList(caseIdList.split(",")); List resultList = null; try { - resultList = CaseApi.getGradeReportCase(list, schoolId,systemOwner); + resultList = CaseApi.getGradeReportCase(list, schoolId, systemOwner); } catch (IOException e) { return new ResultEntity<>(HttpStatus.BAD_REQUEST, "资源中心接口异常"); } @@ -574,8 +574,8 @@ public class TeaGradeManageController { for (int i = 0; i < twoCatalogs.size(); i++) { HashMap hashMap = new HashMap<>(); SysTwoCatalog sysTwoCatalog = twoCatalogs.get(i); - hashMap.put("course_id",sysTwoCatalog.getTwoId()); - hashMap.put("course_name",sysTwoCatalog.getTwoName()); + hashMap.put("course_id", sysTwoCatalog.getTwoId()); + hashMap.put("course_name", sysTwoCatalog.getTwoName()); list.add(hashMap); } } catch (IOException e) { @@ -610,7 +610,7 @@ public class TeaGradeManageController { @RequestParam(required = false) String classId, @ApiParam("学号/姓名搜索框") @RequestParam(required = false) String keyWord, @RequestParam String systemOwner) { - return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord,systemOwner)); + return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord, systemOwner)); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 90407e8..ad6d096 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -363,8 +363,8 @@ public class UserController { @AnonymousAccess @PostMapping("/selectAllClassNameBySchoolId") @ApiOperation("班级下拉框") - public ResultEntity>> selectAllClassNameBySchoolId(@RequestParam String schoolId) { - return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolId)); + public ResultEntity>> selectAllClassNameBySchoolId(@RequestParam String schoolId,@RequestParam String systemOwner) { + return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolId,systemOwner)); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java index 60da85c..3f4087b 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java +++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java @@ -33,8 +33,8 @@ public interface StuClassMapper { int updateByPrimaryKey(StuClass record); - @Select("SELECT DISTINCT s.class_name, s.class_id FROM stu_class s, stu_userinfo u WHERE #{schoolId}= u.school_id;") - List> selectAllClassNameBySchoolId(@Param("schoolId")String schoolId); + @Select("SELECT DISTINCT s.class_name, s.class_id FROM stu_class s, stu_userinfo u WHERE #{schoolId}= u.school_id and system_owner =#{systemOwner}") + List> selectAllClassNameBySchoolId(@Param("schoolId")String schoolId,@Param("systemOwner")String systemOwner); @Select("SELECT s.class_name FROM stu_class s, stu_userinfo u WHERE s.class_id = u.class_id and s.class_id = #{classId};") String selectClassNameByClassId(@Param("classId")String classId); diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java index c0e0113..280af59 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java @@ -291,7 +291,7 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { private List getTeaTrainingInfoDTOS(String schoolId, String keyWord, String classId, String systemOwner) { StuUserExample userExample = new StuUserExample(); StuUserExample.Criteria criteria = userExample.createCriteria(); - criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4); + criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4).andSystemOnwerEqualTo(systemOwner); if (StringUtils.isNotBlank(classId)) { criteria.andClassIdEqualTo(classId); }