jiangping
2025-06-26 2edf3f1fd9505cbdd435524d316e7558b25f6760
server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -15,7 +15,9 @@
import com.doumee.core.utils.qiyeweixin.QywxUtil;
import com.doumee.core.utils.qiyeweixin.model.response.QywxDepartInfoResponse;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.CompanyMemberMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyMember;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.system.model.SystemUser;
@@ -47,6 +49,8 @@
    private RedisTemplate<Object, Serializable> redisTemplate;
    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private CompanyMemberMapper companyMemberMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -151,6 +155,9 @@
    @Override
    public List<Company> companyTree( ) {
        return companyTreeBiz(0);
    }
    public List<Company> companyTreeBiz(int type ) {
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Company.class);
        queryWrapper.selectAs(SystemUser::getUsername,Company::getEditorName);
@@ -161,10 +168,23 @@
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByAsc( "t.code");
        List<Company> companyList = companyMapper.selectJoinList(Company.class,queryWrapper);
        CompanyTree treeBuild = new CompanyTree(companyList, 0);
        List<CompanyMember> memberList = null;
        if(type == 1){
            memberList = companyMemberMapper.selectJoinList(CompanyMember.class,new MPJLambdaWrapper<CompanyMember>()
                    .selectAll(CompanyMember.class)
                    .selectAs(Member::getName,CompanyMember::getMemberName)
                    .leftJoin(Member.class,Member::getId,CompanyMember::getMemberId)
                    .eq(Member::getIsdeleted,Constants.ZERO )
                    .eq(CompanyMember::getIsdeleted,Constants.ZERO ));
        }
        CompanyTree treeBuild = new CompanyTree(companyList, 0,memberList);
        companyList = treeBuild.buildTree();
        return companyList;
    }
    @Override
    public List<Company> companyTreeWithMember() {
        return companyTreeBiz(1);
    }
    @Override
    public int syncAll(Company company) {