Merge remote-tracking branch 'origin/master'

jiangping

2025-04-27 41d9c70dfc6dbe060eaaf5bfc153885be8140c76

 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);