From daa017224030fce37185016a28df83f1523b093f Mon Sep 17 00:00:00 2001 From: MerCry Date: Tue, 10 Feb 2026 22:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=88=90=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E4=B8=80=E4=B8=AA=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E8=AF=9D=20=E9=BB=98=E8=AE=A4=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E9=80=89=E6=8B=A9=E8=BF=99=E4=B8=80=E4=B8=AA=E4=BC=81?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wecom/service/impl/CorpInfoServiceImpl.java | 14 +++++++++++++- .../excel/wecom/vo/CustomerStatisticsDataVO.java | 2 +- .../web/controller/system/SysLoginController.java | 7 +++++-- .../com/ruoyi/common/utils/CorpContextHolder.java | 2 ++ ruoyi-ui/src/views/login.vue | 2 -- ruoyi-ui/src/views/wecom/corpInfo/index.vue | 3 --- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/impl/CorpInfoServiceImpl.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/impl/CorpInfoServiceImpl.java index 63e2578..234b2c9 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/impl/CorpInfoServiceImpl.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/impl/CorpInfoServiceImpl.java @@ -1,11 +1,14 @@ package com.ruoyi.excel.wecom.service.impl; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.excel.wecom.domain.CorpInfo; import com.ruoyi.excel.wecom.mapper.CorpInfoMapper; import com.ruoyi.excel.wecom.service.ICorpInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; import java.util.List; /** @@ -13,10 +16,19 @@ import java.util.List; */ @Service public class CorpInfoServiceImpl implements ICorpInfoService { - + private static final String CURRENT_CORP_KEY_PREFIX_ONLY = "current_corp_only:"; @Autowired private CorpInfoMapper corpInfoMapper; + @PostConstruct + public void setCorpInfoWhenOne() { + List corpInfos = corpInfoMapper.selectList(null); + if(corpInfos.size() == 1) { + RedisCache redisCache = SpringUtils.getBean(RedisCache.class); + String corpId = corpInfos.get(0).getCorpId(); + redisCache.setCacheObject(CURRENT_CORP_KEY_PREFIX_ONLY, corpId); + } + } /** * 查询企业信息列表 * diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/vo/CustomerStatisticsDataVO.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/vo/CustomerStatisticsDataVO.java index 8fd9462..5cd2ee2 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/vo/CustomerStatisticsDataVO.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/vo/CustomerStatisticsDataVO.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; /** - * 客户统计数据VO + * 流量看板数据VO * 用于EasyExcel导出客户统计数据 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index ad32b1e..e7e1e1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -36,6 +36,7 @@ import java.util.Set; public class SysLoginController { private static final String CURRENT_CORP_KEY_PREFIX = "current_corp:"; + private static final String CURRENT_CORP_KEY_PREFIX_ONLY = "current_corp_only:"; @Autowired private SysLoginService loginService; @@ -82,8 +83,6 @@ public class SysLoginController { LoginUser loginUser = SecurityUtils.getLoginUser(); - - SysUser user = loginUser.getUser(); // 1. 获取当前登录用户ID Long userId = user.getUserId(); @@ -93,6 +92,10 @@ public class SysLoginController String corpId = redisCache.getCacheObject(key); if (corpId != null) { CorpContextHolder.setCurrentCorpId(corpId); + } else { + //获取唯一的corpId + corpId = redisCache.getCacheObject(CURRENT_CORP_KEY_PREFIX_ONLY); + CorpContextHolder.setCurrentCorpId(corpId); } // 角色集合 Set roles = permissionService.getRolePermission(user); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CorpContextHolder.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CorpContextHolder.java index 58fa22b..0f24128 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CorpContextHolder.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CorpContextHolder.java @@ -14,6 +14,8 @@ public class CorpContextHolder { */ private static final String CURRENT_CORP_KEY_PREFIX = "current_corp:"; + private static final String CURRENT_CORP_KEY_PREFIX_ONLY = "current_corp_only:"; + /** * 获取当前用户正在使用的企业ID * diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index dde986d..3bef843 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -75,8 +75,6 @@ export default { footerContent: defaultSettings.footerContent, codeUrl: "", loginForm: { - username: "admin", - password: "admin123", rememberMe: false, code: "", uuid: "" diff --git a/ruoyi-ui/src/views/wecom/corpInfo/index.vue b/ruoyi-ui/src/views/wecom/corpInfo/index.vue index a1d64d0..cc99f3e 100644 --- a/ruoyi-ui/src/views/wecom/corpInfo/index.vue +++ b/ruoyi-ui/src/views/wecom/corpInfo/index.vue @@ -61,10 +61,7 @@ - - -