Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

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

@@ -61,10 +61,10 @@
                 LEFT JOIN
             sys_user b on a.create_id = b.id
         <where>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
-            <if test="printPlanIdList.size() > 0">
+            <if test="printPlanIdList != null">
                 and a.id IN
                 <foreach collection="printPlanIdList" item="item" index="index" open="(" separator="," close=")">
                     #{item}
@@ -73,10 +73,10 @@
             <if test="status != null">
                 and a.status = #{status}
             </if>
-            <if test="startTime != null and startTime > 0">
+            <if test="startTime != null and startTime != ''">
                 and a.create_time >= #{startTime}
             </if>
-            <if test="endTime != null and endTime > 0">
+            <if test="endTime != null and endTime != ''">
                 and #{endTime} >= a.create_time
             </if>
             <if test="orgIds != null">
@@ -125,16 +125,16 @@
             <foreach collection="status" item="item" index="index" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
             <if test="printPlanId!= null and printPlanId != ''">
                 and a.id = #{printPlanId}
             </if>
-            <if test="startTime != null and startTime > 0">
+            <if test="startTime != null and startTime != ''">
                 and a.create_time >= #{startTime}
             </if>
-            <if test="endTime != null and endTime > 0">
+            <if test="endTime != null and endTime != ''">
                 and #{endTime} >= a.create_time
             </if>
             <if test="orgIds != null">

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

@@ -290,10 +290,10 @@
             <if test="endTime != null and endTime != ''">
                 and a.start_time &lt;= #{endTime}
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 and a.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 and #{endCreateTime} >= a.create_time
             </if>
             <if test="createName != null and createName != ''">
@@ -377,10 +377,10 @@
             <if test="endTime != null and endTime != ''">
                 and a.start_time &lt;= #{endTime}
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 and a.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 and #{endCreateTime} >= a.create_time
             </if>
             <if test="createName != null and createName != ''">

teachcloud-common/src/main/resources/mapper/BasicClazzMapper.xml

@@ -22,7 +22,7 @@
                 AND cap.enable = TRUE
         <where>
             AND clz.enable = TRUE
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 AND clz.school_id = #{schoolId}
             </if>
             <if test="queryParams != null and queryParams != ''">

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -80,19 +80,19 @@
                 AND org.type = 'TEACHING_ROOM'
                 AND org.enable = TRUE
         <where>
-            <if test="courseName != null and courseName.length > 0">
+            <if test="courseName != null and courseName != ''">
                 AND bc.name LIKE CONCAT('%',#{courseName},'%')
             </if>
-            <if test="startCreateTime != null and startCreateTime > 0">
+            <if test="startCreateTime != null and startCreateTime != ''">
                 AND bc.create_time >= #{startCreateTime}
             </if>
-            <if test="endCreateTime != null and endCreateTime > 0">
+            <if test="endCreateTime != null and endCreateTime != ''">
                 AND #{endCreateTime} >= bc.create_time
             </if>
             <if test="enable != null">
                 AND bc.enable = #{enable}
             </if>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and bc.school_id = #{schoolId}
             </if>
             <if test="orgIds != null and orgIds.size > 0">

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -54,10 +54,10 @@
             <if test="queryParams != null and queryParams != ''">
                 and (student_name like concat('%',#{queryParams},'%') or student_code like concat('%',#{queryParams},'%'))
             </if>
-            <if test="schoolId != null and schoolId > 0">
+            <if test="schoolId != null and schoolId != ''">
                 and stu.school_id = #{schoolId}
             </if>
-            <if test="campusId != null and campusId > 0">
+            <if test="campusId != null and campusId != ''">
                 and stu.campus_Id = #{campusId}
             </if>
             <if test="clazzIdList != null">