update

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DSubcontractMapper.xml

@@ -45,13 +45,28 @@
             <if test="bo.customerName != null and bo.customerName != ''">
                 and ds.customer_name =#{bo.customerName}
             </if>
-            <if test="bo.areaName != null and bo.areaName.size > 0">
-                and (
-                    ds.areaName in
-                    <foreach collection="bo.areaName" item="areaName" open="(" close=")" separator=",">
-                        #{areaName}
-                    </foreach>
-                )
+            <if test="bo.areaName != null and bo.areaName.size > 0 or (bo.provinceName != null and bo.provinceName.size > 0) or (bo.cityName != null and bo.cityName.size > 0)">
+                and
+                <trim prefix="(" suffix=")" prefixOverrides="or">
+                    <if test="bo.areaName != null and bo.areaName.size > 0 ">
+                        or dp.area_name in
+                        <foreach collection="bo.areaName" item="areaName" open="(" close=")" separator=",">
+                            #{areaName}
+                        </foreach>
+                    </if>
+                    <if test="bo.provinceName != null and bo.provinceName.size > 0 ">
+                        or dp.province_name in
+                        <foreach collection="bo.provinceName" item="provinceName" open="(" close=")" separator=",">
+                            #{provinceName}
+                        </foreach>
+                    </if>
+                    <if test="bo.cityName != null and bo.cityName.size > 0 ">
+                        or dp.city_name in
+                        <foreach collection="bo.cityName" item="cityName" open="(" close=")" separator=",">
+                            #{cityName}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
         order by ds.sign_date desc