From 869edb425d2e931d756c756c16ee5b3f42ee027a Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期五, 04 八月 2023 13:49:20 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Controller/LoginController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/LoginController.java b/src/main/java/com/gk/hotwork/Controller/LoginController.java
index bb66f16..ea98050 100644
--- a/src/main/java/com/gk/hotwork/Controller/LoginController.java
+++ b/src/main/java/com/gk/hotwork/Controller/LoginController.java
@@ -9,11 +9,8 @@
import com.gk.hotwork.Config.Oauth2.IRedisService;
import com.gk.hotwork.Config.Oauth2.OauthRole;
import com.gk.hotwork.Config.Oauth2.RedisKeyEnum;
-import com.gk.hotwork.Domain.AuthorizationInfo;
-import com.gk.hotwork.Domain.ExamScoreInfo;
+import com.gk.hotwork.Domain.*;
import com.gk.hotwork.Domain.Exception.BusinessException;
-import com.gk.hotwork.Domain.UserFace;
-import com.gk.hotwork.Domain.UserInfo;
import com.gk.hotwork.Domain.Utils.CommonUtil;
import com.gk.hotwork.Domain.Utils.Msg;
import com.gk.hotwork.Domain.Vo.ExamScoreVo;
@@ -48,6 +45,9 @@
ExamScoreService examScoreService;
@Autowired
UserFaceService userFaceService;
+ @Autowired
+ CompanyService companyService;
+
@Value("${host}")
private String host;
@Value("${workname}")
@@ -118,6 +118,14 @@
UserFace userFace = userFaceService.selectByUserId(user.getId());
if (userFace != null)
user.setCode(userFace.getCode());
+ if(user.getCompanyid() != null){
+ CompanyInfo companyInfo = companyService.getById(user.getId());
+ if(companyInfo != null){
+ user.setProvince(companyInfo.getProvince());
+ user.setCity(companyInfo.getCity());
+ user.setCounty(companyInfo.getArea());
+ }
+ }
msg.setResult(user);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.2