|
@@ -536,8 +536,8 @@ public class TextdictInfoController extends BladeController {
|
|
|
//获取当前项目下引用相同模板的元素表信息
|
|
|
List<WbsTreePrivate> wbsTreePrivatesEqual = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery()
|
|
|
.eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
|
|
|
- .eq(WbsTreePrivate::getExcelId, wbsTreePrivate.getExcelId())
|
|
|
- .eq(WbsTreePrivate::getStatus, 1));
|
|
|
+ .eq(WbsTreePrivate::getExcelId, wbsTreePrivate.getExcelId()));
|
|
|
+// .eq(WbsTreePrivate::getStatus, 1));
|
|
|
List<Long> pKeyIds = wbsTreePrivatesEqual.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList());
|
|
|
String ids = StringUtils.join(pKeyIds, ",");
|
|
|
if (StringUtils.isNotEmpty(ids)) {
|
|
@@ -632,7 +632,7 @@ public class TextdictInfoController extends BladeController {
|
|
|
List<Long> cPkeyIds = wbsTreeContractService.getBaseMapper().selectList(Wrappers.<WbsTreeContract>lambdaQuery()
|
|
|
.eq(WbsTreeContract::getProjectId, wbsTreePrivate.getProjectId())
|
|
|
.eq(WbsTreeContract::getExcelId, wbsTreePrivate.getExcelId())
|
|
|
- .eq(WbsTreeContract::getStatus, 1)
|
|
|
+// .eq(WbsTreeContract::getStatus, 1)
|
|
|
.in(WbsTreeContract::getId, cIdsList)).stream().map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
|
|
|
String cPkeyIdsStr = StringUtils.join(cPkeyIds, ",");
|
|
|
if (StringUtils.isNotEmpty(cPkeyIdsStr)) {
|