From 9737cb4761e99b53173d60c1f0b243c8f598ef9a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 15:14:18 +0800
Subject: [PATCH] fix:管理员登陆

---
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 4ef1f94..f6bcba5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -124,7 +124,7 @@
             result.put("account", userBo.getAccount());
             List<FileVo> listFile =  fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
             result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
-            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
         } catch (Exception e) {
             log.error("token���������������" + e.getMessage());
             result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -196,7 +196,7 @@
             result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
             result.put("userId", user.getId());
             result.put("account", user.getAccount());
-            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
+            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
         } catch (Exception e) {
             log.error("token���������������" + e.getMessage());
             result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());

--
Gitblit v1.8.0