解决上游设备数量，不足需求设备数量错误

11 months ago · 01174c0cee
1 changed files with 6 additions and 1 deletions
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
@ -485,7 +485,12 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                    }
                });
                if (dcDevices.size() > 0) {
-                    dcDevices = dcDevices.subList(0, dcExecuteAction.getNumber());
+                    if (dcExecuteAction.getNumber() > dcDevices.size()) {
+                        dcDevices = dcDevices.subList(0, dcDevices.size());
+                    }else {
+                        dcDevices = dcDevices.subList(0, dcExecuteAction.getNumber());
+                    }
+
                }
            } else {
                // 下行 取最小的几个