|
@@ -76,7 +76,7 @@ public class ComListLogic {
|
|
|
|
|
|
List<ComDetail> comDetails = comDetailService.lambdaQuery()
|
|
List<ComDetail> comDetails = comDetailService.lambdaQuery()
|
|
.select(ComDetail::getComListId)
|
|
.select(ComDetail::getComListId)
|
|
- .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), ComDetail::getWebsitId, adminUser.getAdminWebsitIds())
|
|
|
|
|
|
+ .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), ComDetail::getWebsitId, adminUser.getAdminWebsitIds().add(adminUser.getUserName()))
|
|
.list();
|
|
.list();
|
|
List<String> comListIds = comDetails.stream().map(ComDetail::getComListId).collect(Collectors.toList());
|
|
List<String> comListIds = comDetails.stream().map(ComDetail::getComListId).collect(Collectors.toList());
|
|
if (comListIds.size() == 0) {
|
|
if (comListIds.size() == 0) {
|
|
@@ -590,7 +590,7 @@ public class ComListLogic {
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
- public void upFile() {
|
|
|
|
|
|
+ public synchronized void upFile() {
|
|
List<ComList> comListList = comListService.lambdaQuery()
|
|
List<ComList> comListList = comListService.lambdaQuery()
|
|
.eq(ComList::getType, "CENTER")
|
|
.eq(ComList::getType, "CENTER")
|
|
.eq(ComList::getCenterUp, 0).list();
|
|
.eq(ComList::getCenterUp, 0).list();
|
|
@@ -630,6 +630,9 @@ public class ComListLogic {
|
|
//}
|
|
//}
|
|
}
|
|
}
|
|
comDetailService.saveBatch(comDetails);
|
|
comDetailService.saveBatch(comDetails);
|
|
|
|
+
|
|
|
|
+ comList.setCenterUp(true);
|
|
|
|
+ comList.updateById();
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|