魏超 пре 5 година
родитељ
комит
dde20cf6c6
1 измењених фајлова са 4 додато и 1 уклоњено
  1. 4
    1
      src/main/resources/mapper/eContract/TaContractMapper.xml

+ 4
- 1
src/main/resources/mapper/eContract/TaContractMapper.xml Прегледај датотеку

68
             <if test=" bo.companyName != null and bo.companyName != ''">
68
             <if test=" bo.companyName != null and bo.companyName != ''">
69
                 AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
69
                 AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
70
             </if>
70
             </if>
71
-            <if test=" bo.settlement != null and bo.settlement != ''">
71
+            <if test=" bo.settlement != null and bo.settlement ">
72
                 AND t.settlement = #{bo.settlement}
72
                 AND t.settlement = #{bo.settlement}
73
             </if>
73
             </if>
74
+            <if test=" bo.settlement != null and bo.settlement == false ">
75
+                AND (t.settlement = #{bo.settlement} or t.settlement is null)
76
+            </if>
74
             <if test=" bo.companyCode != null and bo.companyCode != ''">
77
             <if test=" bo.companyCode != null and bo.companyCode != ''">
75
                 AND t2.company_code like CONCAT('%',#{bo.companyCode} , '%')
78
                 AND t2.company_code like CONCAT('%',#{bo.companyCode} , '%')
76
             </if>
79
             </if>