添加基础设备同步

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowBusinessVo.java

@@ -35,6 +35,12 @@ public class WindowBusinessVo extends BaseEntityLong {
      */
     private List<Long> windowIdList;
 
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    private String deptName;
+
     /**
      * 大厅ID
      */

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

@@ -59,12 +59,15 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
         Iterator iterator = list.iterator();
         while (iterator.hasNext()) {
             WindowBusinessEntity item = (WindowBusinessEntity) iterator.next();
-            if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(collect.get(item.getWindowId()))) {
-                item.setFromnum(collect.get(item.getWindowId()).getFromnum());
+            WindowEntity windowEntity = collect.get(item.getWindowId());
+            if (!ObjectUtils.isEmpty(item.getWindowId()) && !ObjectUtils.isEmpty(windowEntity)) {
+                item.setDeptId(windowEntity.getDeptId());
+                item.setDeptName(windowEntity.getDeptName());
+                item.setFromnum(windowEntity.getFromnum());
                 WindowHallEntity windowHallEntity = windowHallEntityMap.get(item.getWindowId());
-                if(!ObjectUtils.isEmpty(windowHallEntity)){
-                    item.setHallId( windowHallEntity.getWindowId());
-                    item.setHallName( windowHallEntity.getHallName());
+                if (!ObjectUtils.isEmpty(windowHallEntity)) {
+                    item.setHallId(windowHallEntity.getWindowId());
+                    item.setHallName(windowHallEntity.getHallName());
                 }
             } else {
                 iterator.remove();