1 固定表头第一步

src/main/resources/mapper/bus/jnsp7xtm/mapper/Jnsp7xtmRepository.xml

@@ -37,14 +37,23 @@
         </if>
         WHERE
         1=1
-        <if test='entity.clickOneDimensionality and entity.type == "1"' >
-            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue} or ${entity.oneDimensionality} is null )
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue == null or entity.oneDimensionalityValue == "")' >
+            and (${entity.oneDimensionality} = '' or ${entity.oneDimensionality} is null )
         </if>
-        <if test='entity.clickTwoDimensionality and entity.type == "1"'>
-            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue} or ${entity.twoDimensionality} is null)
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue != null and entity.oneDimensionalityValue != "")'>
+            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue})
         </if>
-        <if test='entity.clickThreeDimensionality and entity.type == "1"'>
-            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue} or ${entity.threeDimensionality} is null )
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue == null or entity.twoDimensionalityValue =="") '>
+            and (${entity.twoDimensionality} = '' or ${entity.twoDimensionality} is null )
+        </if>
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue != null and entity.twoDimensionalityValue!= "") '>
+            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue})
+        </if>
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue == null or entity.threeDimensionalityValue == "")'>
+            and (${entity.threeDimensionality} = '' or ${entity.threeDimensionality} is null )
+        </if>
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue != null and entity.threeDimensionalityValue!= "")'>
+            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue})
         </if>
         <if test="entity.vagueKhdm != null and entity.vagueKhdm != ''">
             and J7xtm.khdm like concat('%',#{entity.vagueKhdm },'%')
@@ -124,14 +133,23 @@
         </if>
         WHERE
         1=1
-        <if test='entity.clickOneDimensionality and entity.type == "1"'>
-            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue} or ${entity.oneDimensionality} is null )
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue == null or entity.oneDimensionalityValue == "")' >
+            and (${entity.oneDimensionality} = '' or ${entity.oneDimensionality} is null )
+        </if>
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue != null and entity.oneDimensionalityValue != "")'>
+            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue})
+        </if>
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue == null or entity.twoDimensionalityValue =="") '>
+            and (${entity.twoDimensionality} = '' or ${entity.twoDimensionality} is null )
         </if>
-        <if test='entity.clickTwoDimensionality and entity.type == "1"'>
-            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue} or ${entity.twoDimensionality} is null )
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue != null and entity.twoDimensionalityValue!= "") '>
+            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue})
         </if>
-        <if test='entity.clickThreeDimensionality and entity.type == "1"'>
-            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue} or ${entity.threeDimensionality} is null )
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue == null or entity.threeDimensionalityValue == "")'>
+            and (${entity.threeDimensionality} = '' or ${entity.threeDimensionality} is null )
+        </if>
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue != null and entity.threeDimensionalityValue!= "")'>
+            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue})
         </if>
         <if test="entity.vagueKhdm != null and entity.vagueKhdm != ''">
             and J7xtm.khdm like concat('%',#{entity.vagueKhdm },'%')
@@ -208,14 +226,23 @@
         </if>
         WHERE
         1=1
-        <if test='entity.clickOneDimensionality and entity.type == "1"' >
-            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue} or ${entity.oneDimensionality}  is null )
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue == null or entity.oneDimensionalityValue == "")' >
+            and (${entity.oneDimensionality} = "" or ${entity.oneDimensionality} is null )
+        </if>
+        <if test='entity.clickOneDimensionality and entity.type == "1" and (entity.oneDimensionalityValue != null and entity.oneDimensionalityValue != "")'>
+            and (${entity.oneDimensionality} = #{entity.oneDimensionalityValue})
+        </if>
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue == null or entity.twoDimensionalityValue =="") '>
+            and (${entity.twoDimensionality} = "" or ${entity.twoDimensionality} is null )
+        </if>
+        <if test='entity.clickTwoDimensionality and entity.type == "1" and (entity.twoDimensionalityValue != null and entity.twoDimensionalityValue!= "") '>
+            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue})
         </if>
-        <if test='entity.clickTwoDimensionality and entity.type == "1"'>
-            and (${entity.twoDimensionality} = #{entity.twoDimensionalityValue} or ${entity.twoDimensionality} is null)
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue == null or entity.threeDimensionalityValue == "")'>
+            and (${entity.threeDimensionality} = "" or ${entity.threeDimensionality} is null )
         </if>
-        <if test='entity.clickThreeDimensionality and entity.type == "1"'>
-            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue} or ${entity.threeDimensionality} is null)
+        <if test='entity.clickThreeDimensionality and entity.type == "1" and (entity.threeDimensionalityValue != null and entity.threeDimensionalityValue!= "")'>
+            and (${entity.threeDimensionality} = #{entity.threeDimensionalityValue})
         </if>
         <if test="entity.vagueKhdm != null and entity.vagueKhdm != ''">
             and J7xtm.khdm like concat('%',#{entity.vagueKhdm },'%')