From d6b6d2571f02b974725c141fb84446a09edb0ad2 Mon Sep 17 00:00:00 2001
From: guosongrui <17737810342@163.com>
Date: Mon, 27 May 2024 13:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=BB=9F=E4=B8=80=E6=8D=A2=E6=88=90=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E4=BA=BA=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/impl/QuitRunningDeviceServiceImpl.java      | 10 +++++++++-
 .../plan/impl/SupervisionPlanPOServiceImpl.java        |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
index ea71b4c7d..82bcb9a10 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
@@ -27,7 +27,9 @@ import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
 import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
 import com.njcn.supervision.service.device.IQuitRunningDeviceService;
+import com.njcn.user.api.UserFeignClient;
 import com.njcn.web.factory.PageFactory;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -55,6 +57,8 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
 
     private final LineFeignClient lineFeignClient;
 
+    private final UserFeignClient userFeignClient;
+
     /**
      * 设备退运对应的流程定义 KEY
      */
@@ -120,7 +124,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
                     DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
         }
-        quitRunningDeviceVOQueryWrapper.orderByDesc("supervision_quit_running_device.Update_Time");
+
+        //获取当前用户部门所有同事的id，查看该部门下所有的数据
+        List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
+        quitRunningDeviceVOQueryWrapper.in("supervision_quit_running_device.Create_By",colleaguesIds)
+                .orderByDesc("supervision_quit_running_device.Update_Time");
         Page<QuitRunningDeviceVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(quitRunningDeviceQueryParam), PageFactory.getPageSize(quitRunningDeviceQueryParam)), quitRunningDeviceVOQueryWrapper);
         List<QuitRunningDeviceVO> records = page.getRecords();
         if (CollectionUtil.isNotEmpty(records)) {
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
index 077e5e739..55a3b57e0 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +34,7 @@ import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.factory.PageFactory;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -116,6 +118,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
 
     @Override
     public Page<SupervisionPlanVO> pagePlan(SupervisionPlanParam supvPlanParam) {
+        QueryWrapper<SupervisionPlanPO> supervisionPlanParamQueryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<SupervisionPlanPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (StrUtil.isNotBlank(supvPlanParam.getSupvOrgId())) {
             List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(supvPlanParam.getSupvOrgId()).getData();
@@ -136,6 +139,9 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
             lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getCreateTime);
         }
 
+        //获取当前用户部门所有同事的id，查看该部门下所有的数据
+        List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
+        lambdaQueryWrapper.in(SupervisionPlanPO::getCreateBy,colleaguesIds);
 
         List<PvTerminalTreeVO> deptList = deptFeignClient.allDeptList().getData();
 //        Map<String, PvTerminalTreeVO> mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));