|
|
@@ -2001,19 +2001,17 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
}*/
|
|
|
|
|
|
Set<String> result;
|
|
|
- //查询当前用户是否存在下级
|
|
|
- Set<String> subordinate = materialStareMapper.getAffiliateId(userId, null);
|
|
|
- if (subordinate.isEmpty()) {
|
|
|
- if ("admin".equals(roleCode)) {
|
|
|
- return materialStareMapper.getCompanyAllUserId(null);
|
|
|
- }
|
|
|
- subordinate.add(userId);
|
|
|
- return subordinate;
|
|
|
- } else {
|
|
|
- //获取其下组员
|
|
|
- result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
|
|
|
- result.add(userId);
|
|
|
+ if ("admin".equals(roleCode)) {
|
|
|
+ return materialStareMapper.getCompanyAllUserId(null);
|
|
|
+ }
|
|
|
+ result = materialStareMapper.getSaleDirctorItsTeamMember(userId);
|
|
|
+ if(Check.isNull(result)){
|
|
|
+ result = materialStareMapper.getUsersByLeaderId(userId);
|
|
|
}
|
|
|
+ result.add(userId);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return result;
|
|
|
}
|
|
|
|