From 806043b16dbda02a8eb7865f1259ef6e11b1a097 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 22 Nov 2022 09:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8E=82=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E3=80=81=E5=8F=96=E6=B6=88=E6=9B=B4=E6=96=B0=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E7=A5=96=E7=BA=A7?=
 =?UTF-8?q?=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/controller/BmsRegionController.java    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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<BmsFactory> defaultFactories = bmsFactoryService.list();
         if(CollectionUtil.isNotEmpty(bmsRegion.getFactoryIds())){
-            //todo 排序失效
-            List<BmsFactory> factories = bmsFactoryService.listByIds(Arrays.asList(bmsRegion.getFactoryIds()));
+            List<BmsFactory> 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);
     }