修复工厂排序、取消更新工厂同时更新祖级链

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -174,8 +174,20 @@ public class BmsRegionController {
         }
         List<BmsFactory> defaultFactories = bmsFactoryService.list();
         if(CollectionUtil.isNotEmpty(bmsRegion.getFactoryIds())){
-            //todo 排序失效
+            List<BmsFactory> factories = new ArrayList<>();
-            List<BmsFactory> factories = bmsFactoryService.listByIds(Arrays.asList(bmsRegion.getFactoryIds()));
+            for (BmsFactory factory : defaultFactories) {
+                boolean exist = false;
+                for (String factoryId : bmsRegion.getFactoryIds()) {
+                    if(factory.getId().equals(factoryId)){
+                        factories.add(factory);
+                        exist = true;
+                        break;
+                    }
+                }
+                if(!exist){
+                    factories.add(factory);
+                }
+            }
             bmsRegion.setFactoryInfos(factories);
         }else {
             bmsRegion.setFactoryInfos(defaultFactories);
@@ -212,7 +224,7 @@ public class BmsRegionController {
         BmsRegion param = new BmsRegion();
         param.setId(regionBo.getId());
         param.setFactoryIds(regionBo.getFactoryIds());
-        boolean result = bmsRegionService.updateBmsRegionById(param);
+        boolean result = bmsRegionService.updateById(param);
         return R.isTrue(result);
     }