|
|
@ -20,6 +20,7 @@ import com.kiisoo.ic.system.entity.PrivilageRoleDO;
|
|
|
|
import com.kiisoo.ic.system.entity.PrivilageUserDO;
|
|
|
|
import com.kiisoo.ic.system.entity.PrivilageUserDO;
|
|
|
|
import com.kiisoo.ic.system.enums.RoleEnum;
|
|
|
|
import com.kiisoo.ic.system.enums.RoleEnum;
|
|
|
|
import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper;
|
|
|
|
import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper;
|
|
|
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
|
@ -597,6 +598,7 @@ public class RetailCompanyService {
|
|
|
|
List<Long> sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId);
|
|
|
|
List<Long> sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId);
|
|
|
|
List<SellerOrganizationalVO> list = new ArrayList<>();
|
|
|
|
List<SellerOrganizationalVO> list = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(sellerIds)){
|
|
|
|
//查询所有的用户信息
|
|
|
|
//查询所有的用户信息
|
|
|
|
List<PrivilageUserDO> list2 = privilageUserDOMapper.selectListPr(sellerIds);
|
|
|
|
List<PrivilageUserDO> list2 = privilageUserDOMapper.selectListPr(sellerIds);
|
|
|
|
Map<Long, PrivilageUserDO> map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getSellerId, p -> p));
|
|
|
|
Map<Long, PrivilageUserDO> map = list2.stream().collect(Collectors.toMap(PrivilageUserDO::getSellerId, p -> p));
|
|
|
@ -647,6 +649,9 @@ public class RetailCompanyService {
|
|
|
|
return new OrganizationVO();
|
|
|
|
return new OrganizationVO();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return vo;
|
|
|
|
return vo;
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
return new OrganizationVO();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|