Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

 zhang-content/src/main/java/com/ruoyi/service/impl/ZAuthorityServiceImpl.java

@@ -308,6 +308,7 @@
                za.setFid(zAuthority.getFid());
                za.setUid(uid);
                addData(za);
                System.out.println(za);
            }
      //  Long []
     //  if(bl)
@@ -329,7 +330,7 @@
                lqw.eq(ZAuthority::getFid,empowerDto.getFid())
                        .eq(ZAuthority::getAuthority, auri)
                        .eq(ZAuthority::getUid, uid);

                System.out.println("11111111111111111111"+list(lqw));
                zAuthorityService.remove(lqw);
             //   addData(za);
            }
@@ -350,9 +351,12 @@


        LambdaQueryWrapper<ZInfoUser> lq = new LambdaQueryWrapper<>();
        lq.in(ZInfoUser::getUserId, allUserListId);
        List<ZInfoUser> userInfo = new ArrayList<>();
        if(allUserListId.size()!=0) {
            lq.in(ZInfoUser::getUserId, allUserListId);

        List<ZInfoUser> userInfo = zInfoUserService.list(lq);
            userInfo = zInfoUserService.list(lq);
        }
      //  Map<Long, String> usi = userInfo.stream().collect(Collectors.toMap(ZInfoUser::getUserId,ZInfoUser::getNickName));
        return AjaxResult.success(userInfo);
    }