3.2.3 bug修改

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -102,7 +102,7 @@
                     AND a.create_id = #{dpr.requestUserId}
                 </if>
                 <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND a.org_id IN
+                    AND c.org_id IN
                     <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
                         #{item}
                     </foreach>

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

@@ -4,6 +4,7 @@ package com.qmth.distributed.print.api;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
+import com.qmth.teachcloud.common.entity.BasicSemester;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.bean.params.BasicSemesterParams;
@@ -83,15 +84,14 @@ public class BasicSemesterController {
 
     /**
      * 启用/禁用
-     * @param id
+     * @param basicSemester
      * @return
      */
     @ApiOperation(value = "学期管理-启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
-    public Result enable(@ApiParam(value = "学期ID", required = true) @RequestParam Long id,
-                                    @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) {
-        return ResultUtil.ok(basicSemesterService.enable(id, enable));
+    public Result enable(@RequestBody BasicSemester basicSemester) {
+        return ResultUtil.ok(basicSemesterService.enable(basicSemester.getId(), basicSemester.getEnable()));
     }
 }

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

@@ -304,7 +304,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                         .eq(SysOrg::getEnable, true)
                         .eq(SysOrg::getName, teachingRoomName));
                 if (Objects.isNull(sysOrg)) {
-                    throw ExceptionResultEnum.ERROR.exception("输入的教研室【" + teachingRoomName + "】不存在");
+                    throw ExceptionResultEnum.ERROR.exception("输入的开课部门【" + teachingRoomName + "】不存在");
                 }
                 Long teachingRoomId = sysOrg.getId();
                 LinkedHashSet<Long> clazzIdSet = new LinkedHashSet<>();