From 70a33fc291b08ccb9b05767df09c76b1fd9219e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 16:42:06 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 3cd3c00..e54e578 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
@@ -4,6 +4,8 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.model.*;
import com.doumee.service.common.CaptchaService;
@@ -23,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Slf4j
@Service
@@ -53,6 +56,9 @@
@Autowired
private SystemLoginLogService systemLoginLogService;
+ @Autowired
+ private CompanyMapper companyMapper;
+
@Override
public String loginByPassword(LoginDTO dto, HttpServletRequest request) {
SystemLoginLog loginLog = new SystemLoginLog();
@@ -65,7 +71,7 @@
loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
loginLog.setOsInfo(Utils.User_Client.getOS(request));
loginLog.setServerIp(Utils.Server.getIP());
- if(isDebug == null || !isDebug){
+ if((isDebug == null || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
// 鏍￠獙楠岃瘉鐮�
try {
captchaService.check(dto.getUuid(), dto.getCode());
@@ -135,6 +141,10 @@
if( !StringUtils.equals(pwd, user.getPassword())){
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ Company company = new Company();
+ if(Objects.nonNull(user.getCompanyId())){
+ company = companyMapper.selectById(user.getCompanyId());
+ }
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
@@ -144,7 +154,8 @@
//鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
- LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,null);
+ LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
return userInfo;
}
+
}
--
Gitblit v1.9.3