|
@@ -65,7 +65,6 @@ import org.springblade.resource.feign.NewIOSSClient;
|
|
|
import org.springblade.resource.vo.NewBladeFile;
|
|
|
import org.springblade.system.cache.ParamCache;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.dao.DataAccessException;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.MediaType;
|
|
@@ -1634,7 +1633,8 @@ public class ExcelTabController extends BladeController {
|
|
|
List<WbsTreeContract> wbsTreeContractList = wbsTreeContractService.getBaseMapper().selectList(Wrappers.<WbsTreeContract>query().lambda()
|
|
|
.likeRight(WbsTreeContract::getNodeName,wbsInfo.getNodeName())
|
|
|
.eq(WbsTreeContract::getContractId, wbsInfo.getContractId())
|
|
|
- .eq(WbsTreeContract::getParentId, wbsInfo.getParentId()));
|
|
|
+ .eq(WbsTreeContract::getParentId, wbsInfo.getParentId())
|
|
|
+ .eq(WbsTreeContract::getTableOwner, wbsInfo.getTableOwner()));
|
|
|
List<WbsTreeContract> wbsTreeContractList2 = wbsTreeContractList.stream().sorted(Comparator.comparing(WbsTreeContract::getCreateTime).reversed()).collect(Collectors.toList());
|
|
|
Set<String> strings = wbsTreeContractList2.stream().map(o -> o.getNodeName()).collect(Collectors.toSet());
|
|
|
List<WbsTreeContract>wbsTreeContractList3=wbsTreeContractList.stream().sorted(Comparator.comparing(WbsTreeContract::getCreateTime)).collect(Collectors.toList());
|