From 2f824a8127b4988af18603879104fa1616287a8a Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=B5=84=E8=B4=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=E7=89=A9=E8=B5=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/controller/basic/UdiRelController.java | 1 +
 .../glxp/api/controller/purchase/userPersonController.java   | 2 ++
 .../java/com/glxp/api/req/purchase/FilterPoductRequest.java  | 1 +
 .../resources/mybatis/mapper/basic/BasicUdiRelMapper.xml     | 5 +++--
 src/main/resources/mybatis/mapper/purchase/SupProductDao.xml | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelController.java
index 6885313..73fbfbb 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelController.java
@@ -53,6 +53,7 @@ public class UdiRelController extends BaseController {
     @ApiOperation(value = "获取同步库UDI信息", response = BasicUdiRelResponse.class)
     @GetMapping("udi/basic/rel/filter")
     public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) {
+        System.out.println(filterUdiRelRequest.toString());
         String nameCode;
         if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
diff --git a/src/main/java/com/glxp/api/controller/purchase/userPersonController.java b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
index a210132..1dae872 100644
--- a/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
@@ -41,6 +41,8 @@ public class userPersonController {
     @ApiOperation(value = "获取用户个人信息", response = UserPersonEntity.class)
     @GetMapping("/sup/company/person/filterList")
     public BaseResponse filterCompanyCert(UserPersonFilterRequest userPersonFilterRequest, BindingResult bindingResult) {
+
+        System.out.println(userPersonFilterRequest.toString());
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
index 57fc3a7..ab26422 100644
--- a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
@@ -13,6 +13,7 @@ public class FilterPoductRequest extends ListPageRequest {
     private String recordProductName;
     private String recordPeopleName;
     private String manufactory;
+    private String cpmctymc;
 
     private String productId;
     private String manufacturerIdFk;
diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
index 8e98b20..fdabf53 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
@@ -62,8 +62,9 @@
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
+            <if test="unionCode != '' and unionCode != null">
+--                 AND nameCode LIKE concat(#{unionCode}, '%')
+                AND nameCode=#{nameCode}
             </if>
             <if test="uuid != '' and uuid != null">
                 AND bur.uuid = #{uuid}
diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
index 7b169cd..1844745 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
@@ -148,8 +148,8 @@
             <if test="recordCode != null and recordCode != ''">
                 and sup_product.recordCode like concat('%', #{recordCode}, '%')
             </if>
-            <if test="recordProductName != null and recordProductName != ''">
-                and sup_product.recordProductName like concat('%', #{recordProductName}, '%')
+            <if test="cpmctymc != null and cpmctymc != ''">
+                and sup_product.recordProductName like concat('%', #{cpmctymc}, '%')
             </if>
             <if test="recordPeopleName != null and recordPeopleName != ''">
                 and sup_product.recordPeopleName like concat('%', #{recordPeopleName}, '%')