From 45a30ba7e81a71776f63aed784dff02941dce0ff Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 2 Aug 2023 14:13:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/bms/controller/BmsChannelController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index a4fa5cb5..f92be722 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -225,7 +225,7 @@ public class BmsChannelController { List supplierList = new ArrayList<>(); if(supplierNames.size()>0) { LambdaQueryWrapper supplierLambdaQueryWrapper = new LambdaQueryWrapper<>(); - supplierLambdaQueryWrapper.in(BmsSupplier::getCode, supplierNames); + supplierLambdaQueryWrapper.in(BmsSupplier::getName, supplierNames); supplierList = bmsSupplierService.list(supplierLambdaQueryWrapper); List existSupplierName = supplierList.stream().map(a -> a.getName()).collect(Collectors.toList()); if (supplierList.size() < supplierNames.size()) { From 527e1637e1690ff5d42430ca27caf6980760a7c8 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 2 Aug 2023 15:01:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BAHR=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java index 8900b609..fdcbb28c 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java @@ -45,4 +45,5 @@ public class SysUserVo { private Object postInfo; + private String hrSystemInfo; }