From 2edf3f1fd9505cbdd435524d316e7558b25f6760 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 14:25:02 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..9f24d45 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
@@ -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;
@@ -24,9 +26,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,8 +45,12 @@
@Service
public class CompanyServiceImpl implements CompanyService {
+ @Resource(name="sessionRedisTemplate")
+ private RedisTemplate<Object, Serializable> redisTemplate;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private CompanyMemberMapper companyMemberMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -146,9 +155,12 @@
@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::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);
@@ -156,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) {
--
Gitblit v1.9.3