u

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DCustomerController.java

@@ -13,10 +13,7 @@ import com.dsk.cscec.service.IDCustomerService;
 import com.dsk.system.domain.SysDept;
 import com.dsk.system.domain.vo.SysDeptVo;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -39,8 +36,8 @@ public class DCustomerController extends BaseController {
     /**
      * 供应商总台账筛选
      */
-    @GetMapping("/all/searchList")
-    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+    @PostMapping("/all/searchList")
+    public TableDataInfo<DCustomer> allSearchList(@RequestBody DCustomerSearchBo bo, PageQuery query) {
         return baseService.allSearchList(bo,query);
     }
 

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

@@ -12,26 +12,37 @@
         from d_customer
         where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
         <if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
-        <if test="bo.region != null and bo.region != '' ">
-            and (
-            <foreach collection="region" item="item" open="(" separator=" or " close=")">
-                register_region = #{item}
-                <if test="bo.province != null and bo.province != '' ">
-                    and (
-                    <foreach collection="province" item="item" open="(" separator=" or " close=")">
-                        register_province = #{item}
-                        <if test="bo.city != null and bo.city != '' ">
+<!--        <if test="bo.region != null and bo.region != '' ">-->
+<!--            and register_region in-->
+<!--            <foreach collection="region" item="item" open="(" separator="," close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
+        <choose>
+            <when test="bo.province != null ">
+                and register_province in
+                <foreach collection="province" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <when test="bo.city != null ">
                 and register_city in
                 <foreach collection="city" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-                        </if>
+            </when>
+            <otherwise>
+                and ( register_province in
+                <foreach collection="province" item="item" open="(" separator="," close=")">
+                    #{item}
                 </foreach>
-                    )
-                </if>
+                or register_city in
+                <foreach collection="city" item="item" open="(" separator="," close=")">
+                    #{item}
                 </foreach>
                 )
-        </if>
+            </otherwise>
+        </choose>
         <if test="bo.customerClass != null and bo.customerClass != '' ">
             and customer_class in
             <foreach collection="customerClass" item="item" open="(" separator="," close=")">