From 4649765b7c6695279bffe88d9bcff73e64b11da7 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Fri, 25 Aug 2023 11:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/pojo/param/AppProjectQueryParm.java |  3 +++
 .../service/impl/AppProjectServiceImpl.java      | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
index 27e3527..a2e5cb5 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java
@@ -33,6 +33,9 @@ public class AppProjectQueryParm {
     @ApiModelProperty(value="工程id")
     private List<String> engineeringIds;
 
+    @ApiModelProperty(value="工程id")
+    private String engineeringId;
+
     @ApiModelProperty(value="起始时间")
 //    @NotNull(message="起始时间不能为空！")
     private String startTime;
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index 66663bf..78cc42d 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Description:
@@ -259,11 +260,18 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //        if(Objects.equals(RequestUtil.getUsername(),"root")){
 //            userId = null;
 //        }
-        List<String> roleengineer = roleEngineerDevService.getRoleengineer();
-        if(CollectionUtils.isEmpty(roleengineer)){
-            return returnpage;
+        /*如何为空前端没传，查询所有*/
+        if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){
+            List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+            appProjectQueryParm.setEngineeringIds(roleengineer);
+
+            if(CollectionUtils.isEmpty(roleengineer)){
+                return returnpage;
+            }
+        }else {
+            appProjectQueryParm.setEngineeringIds(Stream.of(appProjectQueryParm.getEngineeringId()).collect(Collectors.toList()));
         }
-        appProjectQueryParm.setEngineeringIds(roleengineer);
+
         QueryWrapper<CsLedger> queryWrapper = new QueryWrapper<>();
         returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
         List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {