diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index fdf6af2f..34f3e95e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -174,8 +174,20 @@ public class BmsRegionController { } List defaultFactories = bmsFactoryService.list(); if(CollectionUtil.isNotEmpty(bmsRegion.getFactoryIds())){ - //todo 排序失效 - List factories = bmsFactoryService.listByIds(Arrays.asList(bmsRegion.getFactoryIds())); + List factories = new ArrayList<>(); + 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); }