|
@@ -540,31 +540,42 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//===========================================查询下级员工========================
|
|
|
|
|
|
+ public Result getCompanyAllSubordinateByUserId(String userId){
|
|
|
+ Set<String> operatorUserIds = getAffiliateId(userId);
|
|
|
+ return Result.successMsg("查询该用户所有下级userId",operatorUserIds);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
- * 查询当前人员所有下级 返回自己和下属id
|
|
|
+ * 查询当前人员 所属公司 返回自己和下属id
|
|
|
*/
|
|
|
public Set<String> getAffiliateId(String userId) {
|
|
|
+ //查询用户所属公司
|
|
|
+ String companyId = materialStareMapper.getUserCompanyByUserId(userId);
|
|
|
Set<String> result;
|
|
|
//查询当前用户是否存在下级
|
|
|
- Set<String> subordinate = materialStareMapper.getAffiliateId(userId);
|
|
|
+ Set<String> subordinate = materialStareMapper.getAffiliateId(userId,companyId);
|
|
|
if (subordinate.isEmpty()) {
|
|
|
subordinate.add(userId);
|
|
|
return subordinate;
|
|
|
} else {
|
|
|
- result = querySubordinate(subordinate, subordinate);
|
|
|
+ result = querySubordinate(subordinate, subordinate,companyId);
|
|
|
result.add(userId);
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
//递归查询
|
|
|
- private Set<String> querySubordinate(Set<String> leaderIds, Set<String> result) {
|
|
|
+ private Set<String> querySubordinate(Set<String> leaderIds, Set<String> result,String companyId) {
|
|
|
if (leaderIds.isEmpty()) {
|
|
|
return result;
|
|
|
}
|
|
|
- Set<String> temp = materialStareMapper.querySubordinateRecursive(leaderIds);
|
|
|
+ Set<String> temp = materialStareMapper.querySubordinateRecursive(companyId,leaderIds);
|
|
|
result.addAll(temp);
|
|
|
- querySubordinate(temp, result);
|
|
|
+ querySubordinate(temp, result,companyId);
|
|
|
return result;
|
|
|
}
|
|
|
//===========================================查询下级员工========================
|