From 2a5c09591525605cc8c1af625f33ec10a8b22107 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 14 May 2024 14:06:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/LoginController.java | 6 +++++- .../java/com/glxp/api/service/inout/IoGenInvService.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index d6bbb5dc9..46bbee11c 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -81,8 +81,12 @@ public class LoginController extends BaseController { if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } + + log.info(loginRequest.getPassword()); + log.info(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); if (PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) - || loginRequest.getPassword().equals(authAdmin.getPassWord()) || (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))) + || loginRequest.getPassword().equals(authAdmin.getPassWord()) + || (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))) ) { } else { diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 80a5c54a2..11ed6ea4a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -127,6 +127,9 @@ public class IoGenInvService { invProductDetailService.insertList(invProductDetailEntities); } + //todo 若设备入库单，则生成设备登记单，入到科室设备 + + }