甲供材报审展示页送审id不可为空

src/main/java/com/jeeplus/modules/supply/materialsProvidedByAForReview/mapper/xml/MaterialsProvidedByAForReviewMapper.xml

@@ -55,7 +55,6 @@
         left join material_library ml on ml.material_code = a.material_number
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}
-            and (a.submittals_id is not null or a.a.submittals_id != '')
             ${dataScope}
             <if test="projectDefinition != null and projectDefinition != ''">
                 AND a.project_definition LIKE CONCAT('%',#{projectDefinition},'%')
@@ -63,9 +62,14 @@
             <if test="materialNumber != null and materialNumber != ''">
                 AND a.material_number LIKE CONCAT('%',#{materialNumber},'%')
             </if>
-            <if test="submittalsId != null and submittalsId != ''">
-                AND a.submittals_id LIKE CONCAT('%',#{submittalsId},'%')
-            </if>
+            <choose>
+                <when test="submittalsId != null and submittalsId != ''">
+                    AND a.submittals_id LIKE CONCAT('%',#{submittalsId},'%')
+                </when>
+                <otherwise>
+                    and (a.submittals_id is not null or a.submittals_id != '')
+                </otherwise>
+            </choose>
 
         </where>
         <choose>