Merge branch 'dev'

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -364,12 +364,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
         //构建数据
         SysDeptDetailVo detail = BeanUtil.copyProperties(dept, SysDeptDetailVo.class);
         if (ObjectUtil.isNotNull(detail.getLeader())) {
-            userList.stream().filter(u -> Objects.equals(u.getUserId(), detail.getLeader()))
-                .findFirst().ifPresent(u -> {
-                    detail.setWechatId(u.getWechatId());
-                    detail.setWechatQrCode(u.getWechatQrCode());
-                    detail.setAvatar(u.getAvatar());
-                });
+            SysUser user = userMapper.selectById(detail.getLeader());
+            if (user != null) {
+                detail.setWechatId(user.getWechatId());
+                detail.setWechatQrCode(user.getWechatQrCode());
+                detail.setAvatar(user.getAvatar());
+            }
         }
 
         List<SysDeptDetailVo.User> users = userList.stream().map(user -> {