From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index f698a75..d3c77df 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -187,9 +187,16 @@
//濡傛灉openId涓嶄负绌�,缁戝畾璇ョ敤鎴穙penid
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getOpenid,null)
+ .set(SystemUser::getOpenidHkDate,null)
+ .set(SystemUser::getOpenidHkInfo,null)
+ .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
+ .eq(SystemUser::getOpenid,openid)
.eq(SystemUser::getType,user.getType()));
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getOpenid,openid)
+ .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
+ .set(SystemUser::getOpenidHkDate,null)
+ .set(SystemUser::getOpenidHkInfo,null)
.eq(SystemUser::getId,user.getId()));
}
}
@@ -290,6 +297,22 @@
if (user == null) {
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ //娉ㄥ唽鍙告満/鍔冲姟浜哄憳
+ if((Constants.equalsInteger(user.getType(),Constants.ZERO)||Constants.equalsInteger(user.getType(),Constants.TWO)) && Objects.nonNull(user.getMemberId())){
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(Objects.isNull(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ Company company = companyMapper.selectById(user.getCompanyId());
+ if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+
+
String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
// 姣旇緝瀵嗙爜
if( !StringUtils.equals(pwd, user.getPassword())){
--
Gitblit v1.9.3