[退装模块]修改了父装备或者目录不存在时，子装备可被撤回

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

@@ -244,7 +244,26 @@ public class PackingController {
     @PostMapping("/remove")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity remove(@RequestBody List<Integer> ids){
-        packingLibraryService.removeAll(ids);
+        //父级目录存在的装备id
+        List<Integer> list = new ArrayList<>();
+
+        for (Integer id : ids) {
+            //先判断是不是目录
+            PackingLibrary packingLibrary = packingLibraryDao.findById(id).get();
+            if (packingLibrary.getIsRoot() == 1){
+                list.add(id);
+            }else {
+                PackingLibrary byDeleteTagAndId = packingLibraryDao.findByDeleteTagAndIdAndPackingStatus(0, packingLibrary.getPartParentId(),2);
+                if (byDeleteTagAndId == null){
+                    Map<String,Object> map = new HashMap<>();
+                    map.put("error","该型号装备的父装备或者目录不存在");
+                    return ResponseEntity.ok(map);
+                }else {
+                    list.add(id);
+                }
+            }
+        }
+        packingLibraryService.removeAll(list);
         return ResponseEntity.ok("恢复成功");
     }
 
@@ -486,7 +505,7 @@ public class PackingController {
             throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同装备");
         }
         //复制相同的字段
-        if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())&&!packingLibraryService.nameIsExist(packingLibrary.getModel(),packingLibraryUpdateVo.getName())){
+        if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -24,4 +24,6 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
     List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(Integer partParentId,Integer matchingRange,Integer packingStatus,String name);
 
     List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
+
+    PackingLibrary findByDeleteTagAndIdAndPackingStatus(Integer deleteTag,Integer id,Integer packingStatus);
 }