From f714a84bc4a5334b6fe8477fa59d70f28911ade0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 16 Jan 2023 14:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E5=A4=9A?= =?UTF-8?q?=E4=B8=AADI=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/controller/basic/UdiInfoController.java | 3 +-- api-admin/src/main/resources/application-dev.properties | 4 ++-- .../src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index c92d9c1..713ad4b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -320,6 +320,7 @@ public class UdiInfoController { public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId()); + productInfoFilterRequest.setRelId(productInfoFilterRequest.getRelId()); List udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { @@ -330,8 +331,6 @@ public class UdiInfoController { } } } - - return ResultVOUtils.success(udiInfoEntities); } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 3d1eee7..f987e19 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,9 +1,9 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=Glxp@6066 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 8e1049b..427c53c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -101,6 +101,10 @@ AND basic_products.sptm = #{sptm} + + AND basic_udirel.id = #{relId} + +