diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java index 350befc..482e479 100644 --- a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.ydoyun.service.aiassistantreport; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; 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.user.AdminUserService; 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.AiAssistantReportSaveReqVO; @@ -41,7 +41,7 @@ public class AiAssistantReportServiceImpl implements AiAssistantReportService { @Resource private AiAssistantReportDetailService aiAssistantReportDetailService; @Resource - private AdminUserService adminUserService; + private AdminUserApi adminUserApi; @Resource private DeptService deptService; @@ -112,11 +112,11 @@ public class AiAssistantReportServiceImpl implements AiAssistantReportService { // 含本部门及所有下级部门用户(与左侧部门树父节点选中场景一致;仅 dept_id=deptId 会漏掉子部门用户) Set deptScope = new HashSet<>(deptService.getChildDeptIdListFromCache(deptId)); deptScope.add(deptId); - List users = adminUserService.getUserListByDeptIds(deptScope); + List users = adminUserApi.getUserListByDeptIds(deptScope); if (CollUtil.isEmpty(users)) { return Collections.emptyList(); } - List reporterIds = convertList(users, AdminUserDO::getId); + List reporterIds = convertList(users, AdminUserRespDTO::getId); List list = aiAssistantReportMapper.selectListByReporterIdsAndReportDate( reporterIds, moduleCode, reportDate); return BeanUtils.toBean(list, AiAssistantReportRespVO.class);