查询按and

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -539,50 +539,32 @@
             <if test="endTime != null and endTime != '' ">
                 and evaluate_time &lt;= #{endTime}
             </if>
-            <if test="badEvaluateStatus != null or goodEvaluateStatus != null or reviewStatus != null or topHotStatus != null or maliciousStatus != null or goodsCompute != null or storeCompute != null or serviceCompute != null ">
-                and
-                1=1 (
-                <if test="badEvaluateStatus != null or goodEvaluateStatus != null or reviewStatus != null or topHotStatus != null or maliciousStatus != null">
-                    (
-                    <if test="badEvaluateStatus != null ">
-                        and bad_evaluate_status = #{badEvaluateStatus}
-                    </if>
-                    <if test="goodEvaluateStatus != null ">
-                        and good_evaluate_status = #{goodEvaluateStatus}
-                    </if>
-                    <if test="reviewStatus != null ">
-                        and review_status = #{reviewStatus}
-                    </if>
-                    <if test="topHotStatus != null ">
-                        and top_hot_status = #{topHotStatus}
-                    </if>
-                    <if test="maliciousStatus != null ">
-                        and malicious_status = #{maliciousStatus}
-                    </if>
-                    )
-                </if>
-<!--                <if test="badEvaluateStatus == null and goodEvaluateStatus == null and reviewStatus == null and topHotStatus == null and maliciousStatus == null">-->
-<!--                    1=0-->
-<!--                </if>-->
-                and (
-<!--                <if test="goodsCompute == null and storeCompute == null and serviceCompute == null">-->
-<!--                  1=0-->
-<!--                </if>-->
-                1=1
-                <if test="goodsCompute != null or storeCompute != null or serviceCompute != null">
-                  <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
-                    and goods_score ${goodsCompute} #{goodsScore}
-                  </if>
-                  <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
-                    and store_score ${storeCompute} #{storeScore}
-                  </if>
-                  <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
-                    and service_score ${serviceCompute} #{serviceScore}
-                  </if>
-                </if>
-                )
-                )
+            <if test="badEvaluateStatus != null ">
+              and bad_evaluate_status = #{badEvaluateStatus}
+            </if>
+            <if test="goodEvaluateStatus != null ">
+              and good_evaluate_status = #{goodEvaluateStatus}
+            </if>
+            <if test="reviewStatus != null ">
+              and review_status = #{reviewStatus}
+            </if>
+            <if test="topHotStatus != null ">
+              and top_hot_status = #{topHotStatus}
+            </if>
+            <if test="maliciousStatus != null ">
+              and malicious_status = #{maliciousStatus}
             </if>
+
+          <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
+            and goods_score ${goodsCompute} #{goodsScore}
+          </if>
+          <if test="storeCompute != null and storeCompute != '' and storeScore != null ">
+            and store_score ${storeCompute} #{storeScore}
+          </if>
+          <if test="serviceCompute != null and serviceCompute != '' and serviceScore != null ">
+            and service_score ${serviceCompute} #{serviceScore}
+          </if>
+
             <if test="replyStatus != null ">
                 and reply_status = #{replyStatus}
             </if>