From 41d9c70dfc6dbe060eaaf5bfc153885be8140c76 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 27 四月 2025 09:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 2403aa7..4fa54b3 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -24,9 +24,12 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -40,6 +43,8 @@
@Service
public class CompanyServiceImpl implements CompanyService {
+ @Resource(name="sessionRedisTemplate")
+ private RedisTemplate<Object, Serializable> redisTemplate;
@Autowired
private CompanyMapper companyMapper;
@Autowired
@@ -148,7 +153,7 @@
public List<Company> companyTree( ) {
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Company.class);
- queryWrapper.selectAs(SystemUser::getRealname,Company::getEditorName);
+ queryWrapper.selectAs(SystemUser::getUsername,Company::getEditorName);
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.name_path",Company::getParentCompanyPath);
queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
--
Gitblit v1.9.3