巡检报表数据对不上问题处理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderDetailController.java

@@ -124,8 +124,14 @@ public class IotInspectOrderDetailController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-item:query')")
     public CommonResult<ImmutableList> getIotInspectItemStatus(IotCountDataDO vo) {
+        String companyCode;
         Set<Long> ids = new HashSet<>();
-        if (Objects.nonNull(vo.getDeptId())) {
+        if (Objects.isNull(vo.getDeptId())){
+            Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+            companyCode = deptUtil.getCompanyCode(loginUserDeptId);
+            ids = deptUtil.getDeptIds(companyCode);
+        } else {
+            companyCode = deptUtil.getCompanyCode(vo.getDeptId());
             ids = deptService.getChildDeptIdListFromCache(vo.getDeptId());
             ids.add(vo.getDeptId());
         }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderDetailServiceImpl.java

@@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.pms.service.inspect;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.*;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.DeptUtil;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
@@ -44,6 +46,8 @@ public class IotInspectOrderDetailServiceImpl implements IotInspectOrderDetailSe
     private IotDeviceMapper iotDeviceMapper;
     @Autowired
     private IotInspectOrderMapper iotInspectOrderMapper;
+    @Autowired
+    private DeptUtil deptUtil;
 
     @Override
     public Long createIotInspectOrderDetail(IotInspectOrderDetailSaveReqVO createReqVO) {
@@ -125,7 +129,13 @@ public class IotInspectOrderDetailServiceImpl implements IotInspectOrderDetailSe
     public PageResult<IotInspectOrderDetailDO> getOrderDetailItem(IotInspectOrderDetailPageReqVO pageReqVO) {
         PageResult<IotInspectOrderDetailDO> need = new PageResult<>();
         Set<Long> ids = new HashSet<>();
-        if (Objects.nonNull(pageReqVO.getDeptId())) {
+        String companyCode;
+        if (Objects.isNull(pageReqVO.getDeptId())){
+            Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+            companyCode = deptUtil.getCompanyCode(loginUserDeptId);
+            ids = deptUtil.getDeptIds(companyCode);
+        } else {
+            companyCode = deptUtil.getCompanyCode(pageReqVO.getDeptId());
             ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
             ids.add(pageReqVO.getDeptId());
         }