jsa分页查询处理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/jsa/QhseJsaMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.jsa.vo.QhseJsaPageReqVO
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.jsa.QhseJsaDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * QHSE_JSA工作安全分析 Mapper
  *
@@ -15,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QhseJsaMapper extends BaseMapperX<QhseJsaDO> {
 
-    default PageResult<QhseJsaDO> selectPage(QhseJsaPageReqVO reqVO) {
+    default PageResult<QhseJsaDO> selectPage(QhseJsaPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhseJsaDO>()
                 .eqIfPresent(QhseJsaDO::getJsaNo, reqVO.getJsaNo())
                 .betweenIfPresent(QhseJsaDO::getJsaTime, reqVO.getJsaTime())
@@ -24,7 +26,7 @@ public interface QhseJsaMapper extends BaseMapperX<QhseJsaDO> {
                 .eqIfPresent(QhseJsaDO::getJobAddress, reqVO.getJobAddress())
                 .eqIfPresent(QhseJsaDO::getJsaFile, reqVO.getJsaFile())
                 .eqIfPresent(QhseJsaDO::getJobDuty, reqVO.getJobDuty())
-                .eqIfPresent(QhseJsaDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(QhseJsaDO::getDeptId, ids)
                 .likeIfPresent(QhseJsaDO::getDeptName, reqVO.getDeptName())
                 .eqIfPresent(QhseJsaDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(QhseJsaDO::getCreateTime, reqVO.getCreateTime())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/jsa/QhseJsaServiceImpl.java

@@ -14,13 +14,16 @@ import cn.iocoder.yudao.module.pms.dal.mysql.qhse.jsa.QhseJsaMapper;
 import cn.iocoder.yudao.module.pms.service.qhse.ChineseLetterUtil;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 import static cn.hutool.extra.pinyin.PinyinUtil.isChinese;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -43,6 +46,8 @@ public class QhseJsaServiceImpl implements QhseJsaService {
     private DeptUtil deptUtil;
     @Autowired
     private IotRhDailyReportMapper iotRhDailyReportMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createQhseJsa(QhseJsaSaveReqVO createReqVO) {
@@ -138,7 +143,12 @@ public class QhseJsaServiceImpl implements QhseJsaService {
 
     @Override
     public PageResult<QhseJsaDO> getQhseJsaPage(QhseJsaPageReqVO pageReqVO) {
-        return qhseJsaMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return qhseJsaMapper.selectPage(pageReqVO, ids);
     }
 
 }