From dba60ff044f45003a6b68e6e5c91289f4e3ce95f Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 30 Mar 2024 14:41:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=E7=9A=84=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=BC=96=E7=A0=81=E3=80=81=E8=B4=A6=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/base/service/UserTokenService.java | 16 +++++++++++ .../MyAuthenticationProvider.java | 13 ++++++--- .../admin/dataDao/UserTenantMybatisDao.java | 14 ++++++++++ .../admin/service/UserTenantService.java | 17 ++++++++++++ .../service/impl/UserTenantServiceImpl.java | 26 ++++++++++++++++++ .../service/impl/UserTokenServiceImpl.java | 21 +++++++++++++++ .../mapper/admin/UserTenantMapper.xml | 27 +++++++++++++++++++ 7 files changed, 131 insertions(+), 3 deletions(-) diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java index c762dd4b..af43718f 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java @@ -131,6 +131,22 @@ public interface UserTokenService { * @return */ public Long listCount(String otherno,String loginname); + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @return + */ + public Long listOthernoCount(String otherno); + + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @param loginname 登录账号 + * @return + */ + public Long listLoginNameCount(String otherno,String loginname); /** * 查询用户是否存在 diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java index 03c4a6b4..192d9475 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java @@ -120,7 +120,12 @@ public class MyAuthenticationProvider implements AuthenticationProvider { // } //判断手机号与企业编码是否存在 - if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ +// if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ +// throw new AuthenticationServiceException("企业编码错误！"); +// } + + //企业编码是否存在 + if(!"admin".equals(loginname) && userTokenService.listOthernoCount(agentcode).intValue() <= 0){ throw new AuthenticationServiceException("企业编码错误！"); } @@ -128,7 +133,9 @@ public class MyAuthenticationProvider implements AuthenticationProvider { if (!tenantStatus) { throw new AuthenticationServiceException("该租户已被冻结！"); } - if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ + + //判断账号是否存在 + if(!"admin".equals(loginname) && userTokenService.listLoginNameCount(agentcode,loginname).intValue() <= 0){ throw new AuthenticationServiceException("账号不存在！"); } @@ -179,7 +186,7 @@ public class MyAuthenticationProvider implements AuthenticationProvider { } //userTokenService.savePasswordMaxRetry(user.getLoginname()); - throw new AuthenticationServiceException("账号密码不正确"); + throw new AuthenticationServiceException("密码错误"); } @Override diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/UserTenantMybatisDao.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/UserTenantMybatisDao.java index 45be939f..30045c80 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/UserTenantMybatisDao.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/UserTenantMybatisDao.java @@ -18,6 +18,20 @@ public interface UserTenantMybatisDao extends BaseMapper { * @return */ Long listCount(Map query); + + /** + * 查询企业编码是否存在 + * @param query （otherno是否能够命中） + * @return + */ + Long listOthernoCount(Map query); + + /** + * 查询用户是否存在 + * @param query （otherno、loginname是否同时能够命中） + * @return + */ + Long listLoginNameCount(Map query); /** * 查询用户是否存在 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserTenantService.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserTenantService.java index bf7cd6be..afe52510 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserTenantService.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserTenantService.java @@ -40,6 +40,23 @@ public interface UserTenantService extends BaseService { * @return */ public Long listCount(String otherno,String loginname); + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @return + */ + public Long listOthernoCount(String otherno); + + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @param loginname 登录账号 + * @return + */ + public Long listLoginNameCount(String otherno,String loginname); + /** * 查询用户是否存在 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTenantServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTenantServiceImpl.java index ea36c924..41248c20 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTenantServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTenantServiceImpl.java @@ -96,6 +96,32 @@ public class UserTenantServiceImpl extends BaseServiceImpl query = new HashMap<>(); + query.put("otherno",otherno); + return this.userTenantMybatisDao.listOthernoCount(query); + } + + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @param loginname 登录账号 + * @return + */ + public Long listLoginNameCount(String otherno,String loginname){ + Map query = new HashMap<>(); + query.put("otherno",otherno); + query.put("loginname",loginname); + return this.userTenantMybatisDao.listLoginNameCount(query); + } + /** * 查询用户是否存在 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java index e0494324..afbc855b 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java @@ -393,6 +393,27 @@ public class UserTokenServiceImpl implements UserTokenService { public Long listCount(String otherno,String loginname){ return userTenantService.listCount(otherno,loginname); } + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @return + */ + public Long listOthernoCount(String otherno){ + return userTenantService.listOthernoCount(otherno); + } + + + /** + * 查询用户是否存在 + * @param otherno 企业编码 + * @param loginname 登录账号 + * @return + */ + public Long listLoginNameCount(String otherno,String loginname){ + return userTenantService.listLoginNameCount(otherno,loginname); + } + /** * 查询用户是否存在 diff --git a/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml index 9b9e53d1..1cc9fd39 100644 --- a/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml +++ b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml @@ -62,6 +62,33 @@ ) + + + + + +