[申请模块]型号去重

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -655,8 +655,10 @@ public class AllotBillController {
             });
             allotBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFileList()));
         }
-        //测试
-        allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
+        //是否上传接收方B岗
+        if (fileUploadVo.getReceiveUserbId()!=null){
+             allotBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
+        }
         allotBillService.update(allotBill);
         //添加装备日志
         List<Integer> deviceIds = StringSplitUtil.split(allotBill.getAllotCheckDetail());

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -203,6 +203,7 @@ public class DeviceLibraryController {
             ownUnits.add(deviceVo.getOwnUnit());
             locationUnits.add(deviceVo.getLocationUnit());
         });
+
         map.put("pages",deviceLibraryEntities);
         map.put("models",models);
         map.put("names",names);

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -267,6 +267,8 @@ public class PackingController {
                 models.add(p.getModel());
             }
         }
+        //去重
+        models = models.stream().distinct().collect(Collectors.toList());
         map.put("models",models);
         map.put("names",resultList.stream().map(PackingLibrary::getName).collect(Collectors.toSet()));
         return ResultUtil.success(map);

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingLibraryController.java

@@ -131,6 +131,8 @@ public class PackingLibraryController {
         for (PackingLibrary p : packingLibraryEntities){
             models.add(p.getModel());
         }
+        //去重
+        models = models.stream().distinct().collect(Collectors.toList());
         map.put("models",models);
         return ResultUtil.success(map);
     }