bug 配套设备库：修改序列号

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -619,7 +619,7 @@ public class MatchingDeviceController {
         //查询该型号是否是第一次生成(需要保证后4位数唯一)
         List<String> byModelForSeqNumber = matchingDeviceLibraryService.findByModelForSeqNumber(createSeqVo.getModel());
         int start =0;
-        if (!CollectionUtils.isEmpty(byModelForSeqNumber)){
+        if (!CollectionUtils.isEmpty(byModelForSeqNumber)&&byModelForSeqNumber.size()>0){
             //说明数据库中存有该集合中的数字  取出最大的
             String s = byModelForSeqNumber.get(0);
             start = Integer.parseInt(s);

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceModelServiceImpl.java

@@ -28,11 +28,15 @@ public class MatchingDeviceModelServiceImpl implements MatchingDeviceModelServic
     @Override
     public MatchingDeviceModel findByModelAndName(String model, String name) {
         List<MatchingDeviceModel> byModelAndName = matchingDeviceModelDao.findByModelAndName(model, name);
-        if (byModelAndName.size() ==1){
-            return byModelAndName.get(0);
+        if (byModelAndName!=null&&byModelAndName.size()>0) {
+            if (byModelAndName.size() == 1) {
+                return byModelAndName.get(0);
+            } else {
+                return byModelAndName.stream().filter(matchingDeviceModel -> !"0".equals(matchingDeviceModel.getStyle()))
+                        .collect(Collectors.toList()).get(0);
+            }
         }else {
-            return byModelAndName.stream().filter(matchingDeviceModel -> !"0".equals(matchingDeviceModel.getStyle()))
-                    .collect(Collectors.toList()).get(0);
+            return null;
         }