添加窗口无人值守

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

@@ -91,11 +91,11 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         if (ObjectUtils.isEmpty(windowId)) {
             throw new AppException("请选择对应窗口");
         }
-        List<Long> businessIdList =new ArrayList<>();
-        if(!ObjectUtils.isEmpty(businessIds)){
-             businessIdList = Arrays.asList(businessIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+        List<Long> businessIdList = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(businessIds)) {
+            businessIdList = Arrays.asList(businessIds.split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
         }
-       WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
+        WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
         //windowBusinessQuery.setSiteBusinessIdList(businessIdList);
 
         //先删除后再新增
@@ -124,7 +124,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
                 return null;
             }
             return windowBusinessEntity;
-        }).filter(f->f!=null).collect(Collectors.toList());
+        }).filter(f -> f != null).collect(Collectors.toList());
         windowBusinessService.save(windowBusinessEntities, context);
     }
 
@@ -136,13 +136,16 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             WindowBusinessQuery windowBusinessQuery = new WindowBusinessQuery();
             windowBusinessQuery.setWindowIdList(Arrays.asList(ids));
             List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery);
-            windowBusinessService.removeList(windowBusinessEntities, context);
-
+            if (!ObjectUtils.isEmpty(windowBusinessEntities)) {
+                windowBusinessService.removeList(windowBusinessEntities, context);
+            }
             //级联删除窗口事项
             WindowMatterQuery windowMatterQuery = new WindowMatterQuery();
             windowMatterQuery.setWindowIdList(Arrays.asList(ids));
             List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery);
-            windowMatterService.removeList(windowMatterEntities, context);
+            if (!ObjectUtils.isEmpty(windowMatterEntities)) {
+                windowMatterService.removeList(windowMatterEntities, context);
+            }
         }
         Arrays.asList(ids).forEach(id -> {
             pushChangeMsg(id);

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -4,7 +4,7 @@ Content-Type: application/json
 
 {
 "loginName":"admin",
-"password":"adsmile",
+"password":"ybsmzx@2023",
 "securityCode":"8888"
 }
 
@@ -87,7 +87,7 @@ Accept: application/json
 
 
 ###自助终端应用删除
-GET {{baseUrl}}/app/delete?id=18
+GET {{baseUrl}}/app/delete?id=14
 Authorization: {{authToken}}
 Accept: application/json