From d21773b0d86197d133ef4b16fe366232c345c665 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 23:02:50 +0800
Subject: [PATCH] 报表添加
---
project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
index 50cf765..d0faebe 100644
--- a/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
+++ b/project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
@@ -132,11 +132,11 @@
int randomNum = ran.nextInt(10000);
code = String.format("%04d", randomNum);
log.info("鎵嬫満鍙凤細"+phone+"->楠岃瘉鐮侊細"+code);
- boolean send = sendAl(phone, code);
- if (send){
- redisCache.setCacheObject(getCacheKey(phone), code, Constants.PHONE_EXPIRATION, TimeUnit.MINUTES);
- return true;
- }
+// boolean send = sendAl(phone, code);
+// if (send){
+// redisCache.setCacheObject(getCacheKey(phone), code, Constants.PHONE_EXPIRATION, TimeUnit.MINUTES);
+// return true;
+// }
redisCache.setCacheObject(getCacheKey(phone), code, Constants.PHONE_EXPIRATION, TimeUnit.MINUTES);
return false;
}
@@ -187,9 +187,22 @@
if (!verified){
throw new BaseException("鎵嬫満鍙烽獙璇佺爜鏍￠獙澶辫触锛�");
}
- SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber,bo.getPhone()));
+ SysUser user = null;
+ if ("01".equals(bo.getUserType())){
+ user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getPhonenumber,bo.getPhone())
+ .and(wrapper->wrapper.eq(SysUser::getUserType,"00").or().eq(SysUser::getUserType, "01")));
+ } else {
+ user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getPhonenumber,bo.getPhone())
+ .eq(SysUser::getUserType,bo.getUserType())
+ );
+ }
if (user==null){
- throw new BaseException("鎮ㄦ墜鏈哄彿灏氭湭娉ㄥ唽锛�");
+ throw new BaseException("鎮ㄦ墜鏈哄彿灏氭湭娉ㄥ唽鎴栨偍閫夋嫨鐧诲綍绫诲瀷鏈夎锛�");
+ }
+ if (!"0".equals(user.getStatus())){
+ throw new BaseException("鎮ㄨ处鍙峰凡鍋滅敤鎴栧緟瀹℃壒锛岃鑱旂郴钀ュ晢鍔炵鐞嗕汉鍛橈紒");
}
return this.login(user.getUserName(), user.getRecommendUser(), null, null);
}
--
Gitblit v1.9.1