pms 瑞鹰看板 历史日报 1

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotryimprovedailyreport/IotRyImproveDailyReportMapper.java

@@ -17,7 +17,8 @@ public interface IotRyImproveDailyReportMapper extends BaseMapperX<IotRyImproveD
 
     default PageResult<IotRyImproveDailyReportDO> selectPage(IotRyImproveDailyReportPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotRyImproveDailyReportDO>()
-                .eqIfPresent(IotRyImproveDailyReportDO::getDeptId, reqVO.getDeptId())
+                // .eqIfPresent(IotRyImproveDailyReportDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotRyImproveDailyReportDO::getDeptId, reqVO.getDeptIds())
                 .eqIfPresent(IotRyImproveDailyReportDO::getProjectId, reqVO.getProjectId())
                 .eqIfPresent(IotRyImproveDailyReportDO::getTaskId, reqVO.getTaskId())
                 .eqIfPresent(IotRyImproveDailyReportDO::getTitle, reqVO.getTitle())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotryimprovedailyreport/IotRyImproveDailyReportServiceImpl.java

@@ -242,6 +242,13 @@ public class IotRyImproveDailyReportServiceImpl implements IotRyImproveDailyRepo
 
     @Override
     public PageResult<IotRyImproveDailyReportDO> getIotRyImproveDailyReportPage(IotRyImproveDailyReportPageReqVO pageReqVO) {
+        // 查询选择部门下面所有子部门
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+            pageReqVO.setDeptIds(ids);
+        }
         return iotRyImproveDailyReportMapper.selectPage(pageReqVO);
     }