ptw调整+证书人员

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintenance.IotMaintenancePlanDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.accident.IotAccidentReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.IotMeasureCertDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.hazard.IotHazardDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
@@ -72,6 +73,7 @@ public class PmsDataPermissionConfiguration {
             // user
 //            rule.addUserColumn(SupplierDO.class);
             rule.addUserColumn(AdminUserDO.class, "id");
+            rule.addDeptColumn(QhseCertPersonDO.class, "dept_id");
 //            rule.addUserColumn(SupplierDO.class, "creator");
 
         };

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/cert/QhseCertPersonMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.QhseCertPersonP
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * QHSE-证书人员 Mapper
  *
@@ -15,9 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QhseCertPersonMapper extends BaseMapperX<QhseCertPersonDO> {
 
-    default PageResult<QhseCertPersonDO> selectPage(QhseCertPersonPageReqVO reqVO) {
+    default PageResult<QhseCertPersonDO> selectPage(QhseCertPersonPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhseCertPersonDO>()
-                .eqIfPresent(QhseCertPersonDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(QhseCertPersonDO::getDeptId, ids)
                 .likeIfPresent(QhseCertPersonDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(QhseCertPersonDO::getNickname, reqVO.getNickname())
                 .likeIfPresent(QhseCertPersonDO::getPostName, reqVO.getPostName())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/ptw/QhsePtwMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.ptw.vo.QhsePtwPageReqVO
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.ptw.QhsePtwDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * QHSE_PTW作业许可 Mapper
  *
@@ -15,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QhsePtwMapper extends BaseMapperX<QhsePtwDO> {
 
-    default PageResult<QhsePtwDO> selectPage(QhsePtwPageReqVO reqVO) {
+    default PageResult<QhsePtwDO> selectPage(QhsePtwPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhsePtwDO>()
                 .eqIfPresent(QhsePtwDO::getPtwNo, reqVO.getPtwNo())
                 .betweenIfPresent(QhsePtwDO::getPtwTime, reqVO.getPtwTime())
@@ -28,7 +30,7 @@ public interface QhsePtwMapper extends BaseMapperX<QhsePtwDO> {
                 .eqIfPresent(QhsePtwDO::getGuardian, reqVO.getGuardian())
                 .eqIfPresent(QhsePtwDO::getWorkDuty, reqVO.getWorkDuty())
                 .eqIfPresent(QhsePtwDO::getJsaId, reqVO.getJsaId())
-                .eqIfPresent(QhsePtwDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(QhsePtwDO::getDeptId, ids)
                 .likeIfPresent(QhsePtwDO::getDeptName, reqVO.getDeptName())
                 .eqIfPresent(QhsePtwDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(QhsePtwDO::getCreateTime, reqVO.getCreateTime())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/QhseCertPersonServiceImpl.java

@@ -10,13 +10,16 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.QhseCertPersonDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.cert.QhseCertPersonMapper;
 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.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.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -33,6 +36,8 @@ public class QhseCertPersonServiceImpl implements QhseCertPersonService {
     private QhseCertPersonMapper qhseCertPersonMapper;
     @Autowired
     private DeptApi deptApi;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createQhseCertPerson(QhseCertPersonSaveReqVO createReqVO) {
@@ -80,7 +85,12 @@ public class QhseCertPersonServiceImpl implements QhseCertPersonService {
 
     @Override
     public PageResult<QhseCertPersonDO> getQhseCertPersonPage(QhseCertPersonPageReqVO pageReqVO) {
-        return qhseCertPersonMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return qhseCertPersonMapper.selectPage(pageReqVO, ids);
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/ptw/QhsePtwServiceImpl.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.pms.service.qhse.ChineseLetterUtil;
 import cn.iocoder.yudao.module.pms.service.qhse.jsa.QhseJsaService;
 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;
@@ -21,7 +22,9 @@ 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.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -42,6 +45,8 @@ public class QhsePtwServiceImpl implements QhsePtwService {
     private DeptUtil deptUtil;
     @Autowired
     private QhseJsaService qhseJsaService;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createQhsePtw(QhsePtwSaveReqVO createReqVO) {
@@ -105,7 +110,12 @@ public class QhsePtwServiceImpl implements QhsePtwService {
 
     @Override
     public PageResult<QhsePtwDO> getQhsePtwPage(QhsePtwPageReqVO pageReqVO) {
-        return qhsePtwMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return qhsePtwMapper.selectPage(pageReqVO, ids);
     }
 
 }