From a35b8eec96aac2793de732c3fb7513cd6c5b2e4c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 一月 2025 14:39:34 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 527883a..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)
@@ -408,15 +408,15 @@
                 && Objects.nonNull(user.getMemberId())){
             if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                 if(Objects.isNull(user.getCompanyId())){
-                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+                    throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN.getCode(),"瀵逛笉璧凤紝璇ヨ处鍙蜂笉鑳界櫥褰曞徃鏈虹鍝");
                 }
-                Company company = companyMapper.selectById(user.getCompanyId());
+             /*   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);
+            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN.getCode(),"瀵逛笉璧凤紝璇ヨ处鍙蜂笉鑳界櫥褰曞徃鏈虹鍝︼紒");
         }
         if(StringUtils.isNotBlank(password)){
             String pwd = Utils.Secure.encryptPassword(new String(password), user.getSalt());

--
Gitblit v1.9.3