fix(列装模块): 修改列装一键清空回收站

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -449,6 +449,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     @Override
     public void cleanAll(List<Integer> ids) {
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAllByPackingIdIn(ids);
+        Set<String> models = new HashSet<>();
 //        Map<String,String> map = new HashMap<>();
         if (deviceLibraries.size()>0){
 //            map.put("error","该列装目录下存在装备,不能被删除");
@@ -456,6 +457,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         }else {
             for (Integer id:ids){
                 PackingLibrary packingLibrary = getOne(id);
+                models.add(packingLibrary.getModel());
                 packingLibrary.setDeleteTag(1);
                 update(packingLibrary);
                 //添加列装日志
@@ -467,8 +469,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             //发送阅知信息
             List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
             //清空 列装回收站
-            String content = "清空 列装回收站：【型号："+packingLibraryDao.findAllByIdIn(ids).stream()
-                    .map(PackingLibrary::getModel).distinct().collect(Collectors.toList())+"】";
+            String model = String.join(",",models);
+            String content = "清空 列装回收站：【型号："+model+"】";
             MessageBto messageBto = new MessageBto(0,1,content,userIds,0);
             messageBto.setRecord(StringSplitUtil.idListToString(ids));
             messageService.add(messageBto);