xiaof 3 gadi atpakaļ
vecāks
revīzija
0d73b95a96

+ 3 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceServiceImpl.java

@@ -659,7 +659,9 @@ public class PrintCommonServiceServiceImpl implements PrintCommonService {
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(teachingRoomId);
         if (printPlanIdList.size() == 0) {
             QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).in(BasicCourse::getTeachingRoomId, orgIds);
+            queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)
+                    .eq(BasicCourse::getEnable, true)
+                    .in(BasicCourse::getTeachingRoomId, orgIds);
             if (StringUtils.isNotBlank(param)) {
                 queryWrapper.lambda().and(i -> i.like(BasicCourse::getCode, SystemConstant.translateSpecificSign(param))
                         .or().like(BasicCourse::getName, SystemConstant.translateSpecificSign(param)));

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

@@ -188,7 +188,6 @@
             t_f_flow_approve e ON a.flow_id = e.flow_id
         <where>
             a.enable = true
-            and (a.status = 'STAGE' or (a.status = 'SUBMIT' and e.status is not null and e.status != 'FINISH'))
             <if test="userId != null and userId != ''">
                 and a.user_id = #{userId}
             </if>