Browse Source

Merge branch 'V2.0.1' into test

zhaoxian 3 years ago
parent
commit
73246e811c

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

@@ -76,13 +76,13 @@
                 AND stat_date <=#{endTime}
             </if>
             <if test="daTag != null">
-                AND da_tag = #{daTag}
+                AND da_tag like CONCAT('%', #{daTag}, '%')
             </if>
             <if test="sceneTag != null">
-                AND scene_tag = #{sceneTag}
+                AND scene_tag like CONCAT('%', #{sceneTag}, '%')
             </if>
             <if test="modalityTag != null">
-                AND modality_tag = #{modalityTag}
+                AND modality_tag like CONCAT('%', #{modalityTag}, '%')
             </if>
             <if test="industry != null">
                 AND industry = #{industry}
@@ -115,13 +115,13 @@
                 AND stat_date &lt;=#{endTime}
             </if>
             <if test="daTag != null">
-                AND da_tag = #{daTag}
+                AND da_tag like CONCAT('%', #{daTag}, '%')
             </if>
             <if test="sceneTag != null">
-                AND scene_tag = #{sceneTag}
+                AND scene_tag like CONCAT('%', #{sceneTag}, '%')
             </if>
             <if test="modalityTag != null">
-                AND modality_tag = #{modalityTag}
+                AND modality_tag like CONCAT('%', #{modalityTag}, '%')
             </if>
             <if test="industry != null">
                 AND industry = #{industry}