bug修复

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineVersionController.java

@@ -90,9 +90,14 @@ public class AdminMachineVersionController {
         List<PtsMachineVersion> pagedResult = machineVersionService.listMachineVersion(ptsMachineVersion);
         //获取产品集合，用于页面选择产品
         List<Produce> list = produceService.getProduceList();
+
+        Produce produce = new Produce();
+        produce.setProduceId(ptsMachineVersion.getProduceId());
+        produce = produceService.getProduce(produce);
+
         mv.addObject("produceList",list);
         mv.addObject("versionList",pagedResult);
-        mv.addObject("produceName",ptsMachineVersion.getProduceName());
+        mv.addObject("produceName",produce.getProduceName());
         mv.addObject("produceId",ptsMachineVersion.getProduceId());
         return mv;
     }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl

@@ -148,7 +148,7 @@
         <li style="width: 100%;height: 25px;">
             <div style="float: left;width: 200px;">软件版本：
                 <span class="text-red">
-                    <a class="rj-a" style="" href="javascript:void(0);" title="点击查看软件版本" onclick="selectVersion(${produce.produceId ! ''},${produce.produceName ! ''})">${ptsMachineVersion.machineVersionNo ! ''}</a>
+                    <a class="rj-a" style="" href="javascript:void(0);" title="点击查看软件版本" onclick="selectVersion('${produce.produceId ! ''}','${produce.produceName ! ''}')">${ptsMachineVersion.machineVersionNo ! ''}</a>
                 </span>
             </div>
             <div style="float: left;width: 200px;">硬件版本：<span class="text-red">${ptsBom.bomVersion ! ''}</span></div>