Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -322,7 +322,7 @@ public class AdminUserLogic {
         Set<String> adminUserIdList = new HashSet<>();
         if (!adminUser.getUserName().equals("admin")) {
             // 非admin账号，筛选能看的账号
-            this.queryCanSeeAdminUser(adminUserIdList, adminUser);
+//            this.queryCanSeeAdminUser(adminUserIdList, adminUser);
         }
 
         IPage<AdminUser> page = adminUserService.lambdaQuery()
@@ -337,6 +337,7 @@ public class AdminUserLogic {
     private void queryCanSeeAdminUser(Set<String> adminUserIdList, AdminUserCom adminUser) {
         final List<AdminUserPermissionsRela> permissionsRelaList = adminUserPermissionsRelaService.lambdaQuery()
                 .eq(AdminUserPermissionsRela::getAdminUserId, adminUser.getAdminUserId())
+                .eq(AdminUserPermissionsRela::getIsDept, false)
                 .list();
 
         // 商家id集合
@@ -353,7 +354,7 @@ public class AdminUserLogic {
 
         List<String> queryAdminUserIdList = adminUserPermissionsRelaList.stream()
                 .map(AdminUserPermissionsRela::getAdminUserId)
-                .filter(v -> !v.equals(adminUser.getAdminUserId()))
+//                .filter(v -> !v.equals(adminUser.getAdminUserId()))
                 .collect(Collectors.toList());
 
         // 当前登录账号为商家需要排除商户、平台账号；当前登录账号为商户需要排除平台账号