From cb1794d34ab60176dd6e62c451a47774c5d9552f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 13:43:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 7a2a9fa..f0c5d38 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
@@ -286,8 +286,8 @@
.set(SystemUser::getOpenidHkDate,null)
.set(SystemUser::getOpenidHkInfo,null)
.set(SystemUser::getOpenidHkStatus,Constants.ZERO)
+ .ne(SystemUser::getType,Constants.memberType.gkuser)
.eq(SystemUser::getOpenid,openid)
-// .eq(SystemUser::getType,user.getType())
);
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getOpenid,openid)
@@ -403,20 +403,20 @@
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
//娉ㄥ唽鍙告満
- if(!((Constants.equalsInteger(user.getType(),Constants.ZERO)
+ 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);
+ && Objects.nonNull(user.getMemberId())){
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(Objects.isNull(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN.getCode(),"瀵逛笉璧凤紝璇ヨ处鍙蜂笉鑳界櫥褰曞徃鏈虹鍝");
+ }
+ /* 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.getCode(),"瀵逛笉璧凤紝璇ヨ处鍙蜂笉鑳界櫥褰曞徃鏈虹鍝︼紒");
}
if(StringUtils.isNotBlank(password)){
String pwd = Utils.Secure.encryptPassword(new String(password), user.getSalt());
@@ -473,7 +473,7 @@
if (systemUser == null) {
systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
}else{
- if(!(Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)||Constants.equalsInteger(systemUser.getType(),Constants.memberType.internal))){
+ if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
}
}
--
Gitblit v1.9.3