解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml

@@ -8,32 +8,32 @@
            *
     from hygf_household_contract
         LEFT JOIN   hygf_peasant_household  php   ON  php.sequence_nbr = hygf_household_contract.peasant_household_id     <where>
-    <if test="dto.name != null ">
+    <if test="dto.name != null and dto.name !='' ">
         and hygf_household_contract.name like concat('%',#{dto.name},'%')
     </if>
-    <if test="dto.contractNumber != null ">
-        and hygf_household_contract.contractNumber like concat('%',#{dto.contractNumber},'%')
+    <if test="dto.contractNumber != null  and dto.contractNumber !=''">
+        and hygf_household_contract.contract_number like concat('%',#{dto.contractNumber},'%')
     </if>
-    <if test="dto.initiateStatus != null ">
-        and hygf_household_contract.initiateStatus = #{dto.initiateStatus}
+    <if test="dto.initiateStatus != null and dto.initiateStatus !='' ">
+        and hygf_household_contract.initiate_status = #{dto.initiateStatus}
     </if>
-    <if test="dto.peasantHouseholdId != null ">
-        and hygf_household_contract.peasantHouseholdId = #{dto.peasantHouseholdId}
+    <if test="dto.peasantHouseholdId != null and dto.peasantHouseholdId !=''">
+        and hygf_household_contract.peasant_household_id = #{dto.peasantHouseholdId}
     </if>
-    <if test="dto.dealerId != null ">
-        and hygf_household_contract.dealerId = #{dto.dealerId}
+    <if test="dto.dealerId != null and dto.dealerId !=''">
+        and hygf_household_contract.dealer_id = #{dto.dealerId}
     </if>
-    <if test="dto.surveyStatus != null ">
-        and hygf_household_contract.surveyStatus = #{dto.surveyStatus}
+    <if test="dto.surveyStatus != null and dto.surveyStatus !=''">
+        and hygf_household_contract.survey_status = #{dto.surveyStatus}
     </if>
-    <if test="dto.signStatus != null ">
-        and hygf_household_contract.signStatus = #{dto.signStatus}
+    <if test="dto.signStatus != null and dto.signStatus !=''">
+        and hygf_household_contract.sign_status = #{dto.signStatus}
     </if>
-    <if test="dto.userId != null ">
+    <if test="dto.userId != null and dto.userId !=''">
         and hygf_household_contract.userId = #{dto.userId}
     </if>
-    <if test="dto.partyA != null ">
-        and hygf_household_contract.partyA like concat('%',#{dto.partyA},'%')
+    <if test="dto.partyA != null and dto.partyA !=''">
+        and hygf_household_contract.party_a like concat('%',#{dto.partyA},'%')
     </if>
     </where>
         <if test="dto.orderBy  == null ">