完成一半

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

@@ -232,7 +232,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         }
         return baseMapper.selectVoList(
             Wrappers.lambdaQuery(SysUser.class)
-            .eq(SysUser::getStatus, SystemConstants.NORMAL)
             .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
     }
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/FolderServiceImpl.java

@@ -24,6 +24,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysUserVo;
@@ -297,6 +298,11 @@ public class FolderServiceImpl implements IFolderService {
             pageQuery.build(),
             Wrappers.lambdaQuery(SysUserFolders.class)
                 .eq(SysUserFolders::getProjectId, bo.getProjectId())
+                .and(wrapper -> {
+                        wrapper.eq(SysUserFolders::getFolders, "*");
+
+                    }
+                )
                 .orderByDesc(SysUserFolders::getUserId)
         );
         List<Long> userIds = new ArrayList<>();