fix(3d模块): 入库存储渲染类型是装备并且形态是密码机

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

@@ -589,14 +589,15 @@ public class MatchingDeviceController {
         if (matchingDeviceEditVo.getRemake() != null &&
                 !matchingDeviceEditVo.getRemake().equals(m.getRemake())) {
             //添加设备 设备的状态
-            String remark = "将设备的备注改为" + matchingDeviceEditVo.getMatchingDeviceStatusName();
+            String s = matchingDeviceEditVo.getRemake()== null ? "空":matchingDeviceEditVo.getRemake();
+            String remark = "将设备的备注改为" + s;
             DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null, null);
             deviceLogService.addLog(deviceLogDto);
             m.setRemake(matchingDeviceEditVo.getRemake());
         }
         if (matchingDeviceEditVo.getFileRet() != null ) {
             //添加设备 设备的状态
-            String remark = "将设备的文件改为" + matchingDeviceEditVo.getMatchingDeviceStatusName();
+            String remark = "将设备的文件改为" + matchingDeviceEditVo.getFileRet().getName();
             DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null, null);
             m.setStatusJson(JacksonUtil.toJSon(matchingDeviceEditVo.getFileRet()));
             deviceLogService.addLog(deviceLogDto);

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -951,7 +951,9 @@ public class SelfCheckController {
         if (selfCheckVo.getStorageLocationId() != null){
             predicateBuilder.eq(selfCheckVo.getStorageLocationId()!=null,"storageLocationId",selfCheckVo.getStorageLocationId());
         } else {
-            predicateBuilder.eq("storageLocationId",storageLocationId);
+            if (storageLocationId != null){
+                predicateBuilder.eq("storageLocationId",storageLocationId);
+            }
         }
         List<Integer> status = new ArrayList<>(Arrays.asList(5,10,12));
         List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build())