部门查询

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/devicecert/QhseDeviceCertMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.devicecert.vo.QhseDevic
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.devicecert.QhseDeviceCertDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * QHSE应检设备证书 Mapper
  *
@@ -15,10 +17,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QhseDeviceCertMapper extends BaseMapperX<QhseDeviceCertDO> {
 
-    default PageResult<QhseDeviceCertDO> selectPage(QhseDeviceCertPageReqVO reqVO) {
+    default PageResult<QhseDeviceCertDO> selectPage(QhseDeviceCertPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhseDeviceCertDO>()
                 .eqIfPresent(QhseDeviceCertDO::getDeviceId, reqVO.getDeviceId())
-                .eqIfPresent(QhseDeviceCertDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(QhseDeviceCertDO::getDeptId, ids)
                 .likeIfPresent(QhseDeviceCertDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(QhseDeviceCertDO::getCertNo, reqVO.getCertNo())
                 .eqIfPresent(QhseDeviceCertDO::getCertOrg, reqVO.getCertOrg())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/emergency/QhseEmergencyBookMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.emergency.vo.QhseEmerge
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.emergency.QhseEmergencyBookDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * QHSE应检物资台账 Mapper
  *
@@ -15,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QhseEmergencyBookMapper extends BaseMapperX<QhseEmergencyBookDO> {
 
-    default PageResult<QhseEmergencyBookDO> selectPage(QhseEmergencyBookPageReqVO reqVO) {
+    default PageResult<QhseEmergencyBookDO> selectPage(QhseEmergencyBookPageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<QhseEmergencyBookDO>()
                 .likeIfPresent(QhseEmergencyBookDO::getEmergencyName, reqVO.getEmergencyName())
                 .likeIfPresent(QhseEmergencyBookDO::getEmergencyCode, reqVO.getEmergencyCode())
@@ -25,7 +27,7 @@ public interface QhseEmergencyBookMapper extends BaseMapperX<QhseEmergencyBookDO
                 .eqIfPresent(QhseEmergencyBookDO::getDutyPerson, reqVO.getDutyPerson())
                 .eqIfPresent(QhseEmergencyBookDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(QhseEmergencyBookDO::getFile, reqVO.getFile())
-                .eqIfPresent(QhseEmergencyBookDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(QhseEmergencyBookDO::getDeptId, ids)
                 .eqIfPresent(QhseEmergencyBookDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(QhseEmergencyBookDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(QhseEmergencyBookDO::getDeptName, reqVO.getDeptName())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/devicecert/QhseDeviceCertServiceImpl.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.devicecert.vo.QhseDevic
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.devicecert.vo.QhseDeviceCertSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.devicecert.QhseDeviceCertDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.devicecert.QhseDeviceCertMapper;
+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;
 
@@ -14,6 +16,9 @@ import javax.annotation.Resource;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -28,6 +33,8 @@ public class QhseDeviceCertServiceImpl implements QhseDeviceCertService {
 
     @Resource
     private QhseDeviceCertMapper qhseDeviceCertMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createQhseDeviceCert(QhseDeviceCertSaveReqVO createReqVO) {
@@ -82,7 +89,12 @@ public class QhseDeviceCertServiceImpl implements QhseDeviceCertService {
 
     @Override
     public PageResult<QhseDeviceCertDO> getQhseDeviceCertPage(QhseDeviceCertPageReqVO pageReqVO) {
-        return qhseDeviceCertMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return qhseDeviceCertMapper.selectPage(pageReqVO, ids);
     }
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/emergency/QhseEmergencyBookServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.emergency.QhseEmergencyBo
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.emergency.QhseEmergencyBookMapper;
 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;
@@ -19,6 +20,9 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -37,6 +41,8 @@ public class QhseEmergencyBookServiceImpl implements QhseEmergencyBookService {
     private DeptUtil deptUtil;
     @Autowired
     private DeptApi deptApi;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createQhseEmergencyBook(QhseEmergencyBookSaveReqVO createReqVO) {
@@ -81,7 +87,12 @@ public class QhseEmergencyBookServiceImpl implements QhseEmergencyBookService {
 
     @Override
     public PageResult<QhseEmergencyBookDO> getQhseEmergencyBookPage(QhseEmergencyBookPageReqVO pageReqVO) {
-        return qhseEmergencyBookMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return qhseEmergencyBookMapper.selectPage(pageReqVO, ids);
     }
 
 }