Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ConditionMapper.java

@@ -70,5 +70,5 @@ public interface ConditionMapper {
 
     List<ObeCultureProgram> listCultureProgram(@Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCultureProgramCourse(@Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, Long cultureProgramId, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCultureProgramCourse(@Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, @Param("cultureProgramId") Long cultureProgramId, @Param("dpr") DataPermissionRule dpr);
 }

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

@@ -780,12 +780,12 @@
         select
             bp.id,
             bp.name,
-            so.name orgName,
+            so.name orgName
         from basic_professional bp
         left join sys_org so on bp.org_id = so.id
         <where>
             <if test="schoolId != null">
-                and tpp.school_id = #{schoolId}
+                and bp.school_id = #{schoolId}
             </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
@@ -818,10 +818,7 @@
                     WHERE
                         ocp.id = oco.culture_program_id
                         <if test="schoolId != null">
-                            AND oco.school_id = #{professionalId}
-                        </if>
-                        <if test="cultureProgramId != null">
-                            AND oco.culture_program_id = #{cultureProgramId}
+                            AND oco.school_id = #{schoolId}
                         </if>
                         <if test="dpr != null">
                             <if test="dpr.requestUserId != null">
@@ -855,7 +852,7 @@
                 WHERE
                     bc.id = oco.course_id
                 <if test="schoolId != null">
-                    AND oco.school_id = #{professionalId}
+                    AND oco.school_id = #{schoolId}
                 </if>
                 <if test="professionalId != null">
                     AND ocp.professional_id = #{professionalId}