baison/ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 提交代码

Browse Source
This commit is contained in:
ouhaolan
2026-04-27 15:25:12 +08:00
parent 5e7d53e8c6
commit 14532162eb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java
View File

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.ydoyun.service.aiassistantreport;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO; import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO;
import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportRespVO; import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportRespVO;
import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportSaveReqVO; import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportSaveReqVO;
@@ -41,7 +41,7 @@ public class AiAssistantReportServiceImpl implements AiAssistantReportService {
@Resource @Resource
private AiAssistantReportDetailService aiAssistantReportDetailService; private AiAssistantReportDetailService aiAssistantReportDetailService;
@Resource @Resource
private AdminUserService adminUserService; private AdminUserApi adminUserApi;
@Resource @Resource
private DeptService deptService; private DeptService deptService;
@@ -112,11 +112,11 @@ public class AiAssistantReportServiceImpl implements AiAssistantReportService {
// 含本部门及所有下级部门用户（与左侧部门树父节点选中场景一致；仅 dept_id=deptId 会漏掉子部门用户） // 含本部门及所有下级部门用户（与左侧部门树父节点选中场景一致；仅 dept_id=deptId 会漏掉子部门用户）
Set<Long> deptScope = new HashSet<>(deptService.getChildDeptIdListFromCache(deptId)); Set<Long> deptScope = new HashSet<>(deptService.getChildDeptIdListFromCache(deptId));
deptScope.add(deptId); deptScope.add(deptId);
List<AdminUserDO> users = adminUserService.getUserListByDeptIds(deptScope); List<AdminUserRespDTO> users = adminUserApi.getUserListByDeptIds(deptScope);
if (CollUtil.isEmpty(users)) { if (CollUtil.isEmpty(users)) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<Long> reporterIds = convertList(users, AdminUserDO::getId); List<Long> reporterIds = convertList(users, AdminUserRespDTO::getId);
List<AiAssistantReportDO> list = aiAssistantReportMapper.selectListByReporterIdsAndReportDate( List<AiAssistantReportDO> list = aiAssistantReportMapper.selectListByReporterIdsAndReportDate(
reporterIds, moduleCode, reportDate); reporterIds, moduleCode, reportDate);
return BeanUtils.toBean(list, AiAssistantReportRespVO.class); return BeanUtils.toBean(list, AiAssistantReportRespVO.class);