‘linchangsheng’ 4 bulan lalu
induk
melakukan
0870f7612f

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/ComListAllLogic.java

@@ -71,10 +71,10 @@ public class ComListAllLogic {
 
     public IPage<ComList> list(String title, String remark, Boolean isNotice, Integer pageNo, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-
+        adminUser.getAdminWebsitIds().add(adminUser.getUserName());
         List<ComDetail> comDetails = comDetailService.lambdaQuery()
                 .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<String> comListIds = comDetails.stream().map(ComDetail::getComListId).collect(Collectors.toList());
         if (comListIds.size() == 0) {

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/ComListLogic.java

@@ -73,10 +73,10 @@ public class ComListLogic {
 
     public IPage<ComList> list(String title, String remark, Boolean isNotice, Integer pageNo, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-
+        adminUser.getAdminWebsitIds().add(adminUser.getUserName());
         List<ComDetail> comDetails = comDetailService.lambdaQuery()
                 .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<String> comListIds = comDetails.stream().map(ComDetail::getComListId).collect(Collectors.toList());
         if (comListIds.size() == 0) {