添加宜宾环境

base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -33,10 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,20 +132,29 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
     public Rest<List<BusinessEntity>> getBusinessByDept(DeptQuery deptQuery, Context context) {
         //查询部门窗口
         List<WindowEntity> windowEntities = windowService.find(new WindowQuery().deptId(deptQuery.getId()));
-
         //查询窗口业务
         WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
-        windowBusinessQuery.setWindowIdList(windowEntities.stream().map(WindowEntity::getId).collect(Collectors.toList()));
+        List<Long> windowList = windowEntities.stream().map(WindowEntity::getId).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(windowList)){
+            return Rest.ok("窗口查询结果为空", Collections.EMPTY_LIST);
+        }
+        windowBusinessQuery.setWindowIdList(windowList);
         List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery);
 
         SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
-        siteBusinessQuery.setBusinessIdList(windowBusinessEntities.stream().map(WindowBusinessEntity::getSiteBusinessId).collect(Collectors.toList()));
-
+        List<Long> siteBusinessList = windowBusinessEntities.stream().map(WindowBusinessEntity::getSiteBusinessId).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(siteBusinessList)){
+            return Rest.ok("站点业务查询结果为空", Collections.EMPTY_LIST);
+        }
+        siteBusinessQuery.setBusinessIdList(siteBusinessList);
         List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(siteBusinessQuery);
         BusinessQuery businessQuery = new BusinessQuery();
-        businessQuery.setIdList(siteBusinessEntities.stream().map(SiteBusinessEntity::getBusinessId).collect(Collectors.toList()));
+        List<Long> businessList = siteBusinessEntities.stream().map(SiteBusinessEntity::getBusinessId).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(businessList)){
+            return Rest.ok("业务查询结果为空", Collections.EMPTY_LIST);
+        }
+        businessQuery.setIdList(businessList);
         List<BusinessEntity> businessEntities = businessService.find(businessQuery);
-
         return Rest.ok(businessEntities);
     }
 

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -45,7 +45,7 @@ POST {{baseUrl}}/dept/getBusinessByDept
 Content-Type: application/json
 
 {
-  "id":1
+  "id":36
 }
 
 ###部门查看