pms 瑞都 日报 组织机构搜索

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotrddailyreport/IotRdDailyReportMapper.java

@@ -63,7 +63,7 @@ public interface IotRdDailyReportMapper extends BaseMapperX<IotRdDailyReportDO>
 
     default PageResult<IotRdDailyReportDO> selectPage(IotRdDailyReportPageReqVO reqVO) {
         LambdaQueryWrapperX<IotRdDailyReportDO> wrapper = buildCommonQuery(reqVO)
-                .eqIfPresent(IotRdDailyReportDO::getDeptId, reqVO.getDeptId());
+                .eqIfPresent(IotRdDailyReportDO::getProjectId, reqVO.getProjectId());
 
         wrapper.and(wq -> wq.eq(IotRdDailyReportDO::getPlatformWell, 0)
                 .or()
@@ -73,7 +73,7 @@ public interface IotRdDailyReportMapper extends BaseMapperX<IotRdDailyReportDO>
 
     default List<IotRdDailyReportDO> dailyReports(IotRdDailyReportPageReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IotRdDailyReportDO>()
-                .eqIfPresent(IotRdDailyReportDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotRdDailyReportDO::getDeptId, reqVO.getDeptIds())
                 .eqIfPresent(IotRdDailyReportDO::getProjectId, reqVO.getProjectId())
                 .inIfPresent(IotRdDailyReportDO::getProjectId, reqVO.getProjectIds())
                 .eqIfPresent(IotRdDailyReportDO::getPlatformGroup, reqVO.getPlatformGroup())
@@ -124,7 +124,6 @@ public interface IotRdDailyReportMapper extends BaseMapperX<IotRdDailyReportDO>
     default LambdaQueryWrapperX<IotRdDailyReportDO> buildCommonQuery(IotRdDailyReportPageReqVO reqVO) {
         return new LambdaQueryWrapperX<IotRdDailyReportDO>()
                 .inIfPresent(IotRdDailyReportDO::getDeptId, reqVO.getDeptIds())
-                .eqIfPresent(IotRdDailyReportDO::getProjectId, reqVO.getProjectId())
                 .inIfPresent(IotRdDailyReportDO::getProjectId, reqVO.getProjectIds())
                 .eqIfPresent(IotRdDailyReportDO::getTaskId, reqVO.getTaskId())
                 .inIfPresent(IotRdDailyReportDO::getTaskId, reqVO.getTaskIds())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrddailyreport/IotRdDailyReportServiceImpl.java

@@ -218,8 +218,13 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
                 }
             });
         }
-        // 查询所有瑞都日报
-        IotRdDailyReportPageReqVO reqVO = new IotRdDailyReportPageReqVO();
+        // 查询所有瑞都日报 设置组织机构查询条件
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+            pageReqVO.setDeptIds(ids);
+        }
         List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(pageReqVO);
         // key项目id   value项目甲方名称
         Map<Long, String> projectPair = new HashMap<>();