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 selectBuyer(@Param("purchaseName") String purchaseName, @Param("buyerCode") String buyerCode, - @Param("shList") List shList); + @Param("shList") List shList, + @Param("entList") List 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 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 @@ + + and ent_id = '' + + + and ent_id = + + #{item} + + + + and ent_id in + + #{item} + + + and buyer_code = #{buyerCode,jdbcType=VARCHAR} 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(); }