From 653fd3b4083db1c214e659ee0f09d40e58396cc5 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Sat, 22 Apr 2023 20:14:57 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=89=8B=E5=B7=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0entList=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/buyer/dao/BuyerMapper.java           |  4 +++-
 .../buyer/service/impl/BuyerServiceImpl.java    |  2 +-
 .../resources/mybatis/mapper/BuyerMapper.xml    | 17 +++++++++++++++++
 .../order/controller/BuyerController.java       |  4 +++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
index e21948b2..7150f909 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
@@ -78,7 +78,9 @@ public interface BuyerMapper {
      */
     List<BuyerEntity> selectBuyer(@Param("purchaseName") String purchaseName,
                                   @Param("buyerCode") String buyerCode,
-                                  @Param("shList") List<String> shList);
+                                  @Param("shList") List<String> shList,
+                                  @Param("entList") List<String> entList
+    );
 
     /**
      * 删除
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
index a4044c69..c8390aea 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
@@ -101,7 +101,7 @@ public class BuyerServiceImpl implements BuyerService {
         log.info("{}购方信息模糊查询开始，参数为 {}", LOGGER_MSG, purchaseName);
         List<BuyerEntity> dataList;
         log.info("{}购方信息模糊查询调用本地数据库开始。。。", LOGGER_MSG);
-        dataList = buyerMapper.selectBuyer(purchaseName, buyerCode, shList);
+        dataList = buyerMapper.selectBuyer(purchaseName, buyerCode, shList,entList);
         if (dataList != null && dataList.size() > 0) {
             return dataList;
         } else {
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
index d163402c..e8e5faa5 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
@@ -951,6 +951,23 @@
                 </foreach>
             </if>
 
+            <if test="entList != null and entList.size() == 0">
+                and ent_id = ''
+            </if>
+            <if test="entList != null and entList.size() == 1">
+                and ent_id =
+                <foreach collection="entList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="entList != null and entList.size() > 1">
+                and ent_id in
+                <foreach collection="entList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
             <if test="buyerCode != null and buyerCode != ''">
                 and buyer_code = #{buyerCode,jdbcType=VARCHAR}
             </if>
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
index 37367745..644b78ba 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
@@ -325,7 +325,9 @@ public class BuyerController {
     @PostMapping("/queryBuyerInfoList")
     @ApiOperation(value = "购方信息模糊查询", notes = "购方信息管理-购方信息模糊查询")
     @SysLog(operation = "购方信息模糊查询", operationDesc = "购方信息模糊查询操作", key = "购方信息管理")
-    public R queryBuyerInfoList(@RequestParam String purchaseName, @RequestParam String xhfNsrsbh, @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) {
+    public R queryBuyerInfoList(@RequestParam String purchaseName,
+                                @RequestParam String xhfNsrsbh,
+                                @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) {
         if (StringUtils.isBlank(xhfNsrsbh)) {
             return R.error();
         }