fix(装备模块): 修复了一个bug

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

@@ -841,35 +841,37 @@ public class DeviceLibraryController {
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setTryOutDevice(libraryUpdateVo.getTryOutDevice());
             }
-            if (libraryUpdateVo.getPackingVo().getPackingId() != null && !libraryUpdateVo.getPackingVo().getPackingId().equals(deviceLibraryEntity.getPackingId())) {
-                //添加装备日志
-                //修改型号就要修改列装id
-                PackingVo packingVo = libraryUpdateVo.getPackingVo();
-                String remarkModel = "将装备的型号由" + deviceLibraryEntity.getModel() + "改为" + packingVo.getModel();
-                String remarkType = "";
-                String remarkName = "";
-                String remarkMatchingRange = "";
-                deviceLibraryEntity.setModel(packingVo.getModel());
-                deviceLibraryEntity.setPackingId(packingVo.getPackingId());
-
-                if (!deviceLibraryEntity.getName().equals(packingVo.getName())){
-                    remarkName = "将装备的名称由" + deviceLibraryEntity.getName() + "改为" + packingVo.getName();
-                    deviceLibraryEntity.setName(packingVo.getName());
-                }
-                //修改形态
-                if (!deviceLibraryEntity.getType().equals(packingVo.getType())){
-                    remarkType= "将装备的形态由" + deviceLibraryEntity.getTypeName() + "改为" + packingVo.getTypeName();
-                    deviceLibraryEntity.setType(packingVo.getType());
-                }
-                //修改配用范围
-                if (!deviceLibraryEntity.getMatchingRange().equals(packingVo.getMatchingRange())){
-                    remarkMatchingRange = "将装备的配用范围由" + deviceLibraryEntity.getMatchingRangeName() + "改为" + packingVo.getMatchingRangeName();
-                    deviceLibraryEntity.setMatchingRange(packingVo.getMatchingRange());
-                }
-                String lastRemark = (remarkModel+remarkType+remarkName+remarkMatchingRange).replaceAll("\\\"", "");
-                DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), lastRemark, null,null,null);
-                deviceLogService.addLog(deviceLogDto);
+            if (libraryUpdateVo.getPackingVo() !=null){
+                if (libraryUpdateVo.getPackingVo().getPackingId() != null && !libraryUpdateVo.getPackingVo().getPackingId().equals(deviceLibraryEntity.getPackingId())) {
+                    //添加装备日志
+                    //修改型号就要修改列装id
+                    PackingVo packingVo = libraryUpdateVo.getPackingVo();
+                    String remarkModel = "将装备的型号由" + deviceLibraryEntity.getModel() + "改为" + packingVo.getModel();
+                    String remarkType = "";
+                    String remarkName = "";
+                    String remarkMatchingRange = "";
+                    deviceLibraryEntity.setModel(packingVo.getModel());
+                    deviceLibraryEntity.setPackingId(packingVo.getPackingId());
+
+                    if (!deviceLibraryEntity.getName().equals(packingVo.getName())){
+                        remarkName = "将装备的名称由" + deviceLibraryEntity.getName() + "改为" + packingVo.getName();
+                        deviceLibraryEntity.setName(packingVo.getName());
+                    }
+                    //修改形态
+                    if (!deviceLibraryEntity.getType().equals(packingVo.getType())){
+                        remarkType= "将装备的形态由" + deviceLibraryEntity.getTypeName() + "改为" + packingVo.getTypeName();
+                        deviceLibraryEntity.setType(packingVo.getType());
+                    }
+                    //修改配用范围
+                    if (!deviceLibraryEntity.getMatchingRange().equals(packingVo.getMatchingRange())){
+                        remarkMatchingRange = "将装备的配用范围由" + deviceLibraryEntity.getMatchingRangeName() + "改为" + packingVo.getMatchingRangeName();
+                        deviceLibraryEntity.setMatchingRange(packingVo.getMatchingRange());
+                    }
+                    String lastRemark = (remarkModel+remarkType+remarkName+remarkMatchingRange).replaceAll("\\\"", "");
+                    DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), lastRemark, null,null,null);
+                    deviceLogService.addLog(deviceLogDto);
 
+                }
             }
             deviceLibraryService.update(deviceLibraryEntity);
         }