diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java index 4c90d69..187e603 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-12-15 11:11:21 * @LastEditors: Kane - * @LastEditTime: 2022-12-16 21:38:32 + * @LastEditTime: 2022-12-16 22:02:03 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\controllers\account\P13AccountCheckController.java * @Description: P13账号验证用Controller。 * @@ -51,18 +51,24 @@ public class P13AccountCheckController } catch ( SQLException error ) { + staff = null; result.setMessage( "人员工号或P13账号不存在!" ); result.setSuccess( false ); + } catch ( ClassNotFoundException error ) { + staff = null; result.setMessage( "加载Oracle驱动失败!" ); result.setSuccess( false ); } - // 查询结果是null,说明工号或p13账号不存在,返回结果。 + // 查询结果是null,说明没有查询到结果,工号或p13账号不存在,返回结果。 if ( staff == null) { + result.setMessage( "人员工号或P13账号不存在!" ); + result.setSuccess( false ); + return result; } @@ -83,6 +89,7 @@ public class P13AccountCheckController { result.setSuccess( true ); result.setMessage( "验证成功!" ); + result.setStaffInfo( staff ); // 将获取到的人员信息保存到会话中 HttpSession session = request.getSession(); @@ -91,7 +98,7 @@ public class P13AccountCheckController } else { result.setSuccess( false ); - result.setMessage( "验证失败!" ); + result.setMessage( "验证失败,密码错误!" ); } return result; diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckResult.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckResult.java index b7075c0..2d93eb6 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckResult.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckResult.java @@ -2,8 +2,8 @@ * @Author: Kane * @Date: 2022-12-15 11:17:26 * @LastEditors: Kane - * @LastEditTime: 2022-12-15 11:17:38 - * @FilePath: \AdminSys\src\main\java\com\cpicxim\web\controllers\account\CheckResult.java + * @LastEditTime: 2022-12-16 21:53:30 + * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\controllers\account\P13AccountCheckResult.java * @Description: * * Copyright (c) ${2022} by Kane, All Rights Reserved. @@ -11,6 +11,7 @@ package com.cpic.xim.web.controllers.account; +import com.cpic.xim.myutils.account.CpicXIMStaffInfo; import com.fasterxml.jackson.annotation.*;; public class P13AccountCheckResult @@ -38,6 +39,15 @@ public class P13AccountCheckResult this.message = message; } + public CpicXIMStaffInfo getStaffInfo() + { + return staffInfo; + } + + public void setStaffInfo( CpicXIMStaffInfo staffInfo ) + { + this.staffInfo = staffInfo; + } @Override public int hashCode() @@ -75,4 +85,7 @@ public class P13AccountCheckResult @JsonProperty( "message") private String message; + + @JsonProperty( "staff_info") + CpicXIMStaffInfo staffInfo; }