Ver código fonte

Merge branch 'V2.0.1' into test

zhaoxian 3 anos atrás
pai
commit
2e0c5a0f49

+ 8 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/mapper/xml/ExternalMaterialCollectionMapper.xml

@@ -64,7 +64,7 @@
         ctop_external_material_collection
         <where>
             <if test="materialName != null">
-                AND material_name = #{materialName}
+                AND material_name like CONCAT(CONCAT('%',#{materialName}, '%')
             </if>
             <if test="mediaType != null">
                 AND media_type =#{mediaType}
@@ -90,6 +90,9 @@
             <if test="materialSource != null">
                 AND material_source = #{materialSource}
             </if>
+            <if test="platePosition != null">
+                AND plate_position LIKE CONCAT(CONCAT('%',#{platePosition}, '%')
+            </if>
         </where>
     </select>
 
@@ -100,7 +103,7 @@
         ctop_external_material_collection
         <where>
             <if test="materialName != null">
-                AND material_name = #{materialName}
+                AND material_name like CONCAT(CONCAT('%',#{materialName}, '%')
             </if>
             <if test="mediaType != null">
                 AND media_type =#{mediaType}
@@ -126,6 +129,9 @@
             <if test="materialSource != null">
                 AND material_source = #{materialSource}
             </if>
+            <if test="platePosition != null">
+                AND plate_position LIKE CONCAT(CONCAT('%',#{platePosition}, '%')
+            </if>
         </where>
             ORDER BY create_time DESC
     </select>