|
@@ -71,10 +71,10 @@ public class ComListAllLogic {
|
|
|
|
|
|
public IPage<ComList> list(String title, String remark, Boolean isNotice, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
|
public IPage<ComList> list(String title, String remark, Boolean isNotice, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
|
AdminUserCom adminUser = commonLogic.getAdminUser(request);
|
|
AdminUserCom adminUser = commonLogic.getAdminUser(request);
|
|
-
|
|
|
|
|
|
+ adminUser.getAdminWebsitIds().add(adminUser.getUserName());
|
|
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().add(adminUser.getUserName()))
|
|
|
|
|
|
+ .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), ComDetail::getWebsitId, adminUser.getAdminWebsitIds())
|
|
.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) {
|