bug

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -59,7 +59,7 @@ import java.util.stream.Collectors;
 @Api(tags = "命题任务Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/task")
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+
 public class ExamTaskController {
 
     @Autowired
@@ -814,6 +814,7 @@ public class ExamTaskController {
     @ApiOperation(value = "命题任务-审批-获取试卷审批表pdf")
     @RequestMapping(value = "/find_approve_form_pdf", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+//    @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
     public void findApproveFormPdf(@ApiParam(value = "命题任务id", required = true) @RequestParam String examTaskId,
                                    @ApiParam(value = "html", required = true) @RequestParam String htmlContent) throws Exception {
         // -- 测试用html --

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -20,6 +20,7 @@ import com.qmth.teachcloud.common.mapper.SysUserMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.apache.ibatis.annotations.Case;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -301,9 +302,18 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum) {
-        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        return this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getType, orgTypeEnum)
-                .eq(SysOrg::getEnable, true)
-                .in(SysOrg::getId, orgIds));
+
+        Set<Long> orgIds = null;
+        if (OrgTypeEnum.TEACHING_ROOM.equals(orgTypeEnum)){
+            orgIds = teachcloudCommonService.listSubOrgIds(null);
+        }
+        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SysOrg::getType, orgTypeEnum)
+                .eq(SysOrg::getEnable, true);
+        if (Objects.nonNull(orgIds)){
+            queryWrapper.lambda().in(SysOrg::getId,orgIds);
+        }
+
+        return this.list(queryWrapper);
     }
 }