caozixuan 3 жил өмнө
parent
commit
41b939285a

+ 4 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1731,6 +1731,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .stream()
                 .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
                 .collect(Collectors.toList());
+//        List<SysOrg> collegeList = sysOrgService.findByConnectByParentId(teachingRoom.getId(),true)
+//                .stream()
+//                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
+//                .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(collegeList)){
             throw ExceptionResultEnum.ERROR.exception("找不到学院");
         }

+ 3 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/OrgCenterDataDisposeServiceImpl.java

@@ -60,9 +60,9 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
             String logo = String.valueOf(map.get("logo"));
             String accessKey = String.valueOf(map.get("accessKey"));
             String accessSecret = String.valueOf(map.get("accessSecret"));
-            Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
-            String typeCode = String.valueOf(typeMap.get("code"));
-            String typeName = String.valueOf(typeMap.get("name"));
+//            Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
+//            String typeCode = String.valueOf(typeMap.get("code"));
+//            String typeName = String.valueOf(typeMap.get("name"));
 
             List<BasicSchool> oldSchoolList = basicSchoolList.stream().filter(e -> e.getCode().equals(code)).collect(Collectors.toList());
             if (oldSchoolList.size() > 1) {