JiangChongBo 2 years ago
parent
commit
98d39ff9d4

+ 10 - 8
src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -100,14 +100,16 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
         List<Product> list = dao.findList(entity);
         List<Product> list = dao.findList(entity);
         list.forEach(p -> {
         list.forEach(p -> {
             CmSku sku = productDao.findSku(p.getProductID());
             CmSku sku = productDao.findSku(p.getProductID());
-            p.setPrice(sku.getPrice());
-            p.setNormalPrice(sku.getNormalPrice());
-            Integer costCheckFlag = sku.getCostCheckFlag();
-            p.setCostCheckFlag(costCheckFlag.toString());
-            if(1==costCheckFlag){
-                p.setCostPrice(sku.getCostPrice().toString());
-            }else{
-                p.setSqlCostProportional(sku.getCostProportional());
+            if(null!=sku){
+                p.setPrice(sku.getPrice());
+                p.setNormalPrice(sku.getNormalPrice());
+                Integer costCheckFlag = sku.getCostCheckFlag();
+                p.setCostCheckFlag(costCheckFlag.toString());
+                if(1==costCheckFlag){
+                    p.setCostPrice(sku.getCostPrice().toString());
+                }else{
+                    p.setSqlCostProportional(sku.getCostProportional());
+                }
             }
             }
         });
         });
         page.setList(list);
         page.setList(list);

+ 3 - 3
src/main/webapp/WEB-INF/views/modules/info/infoAdList.jsp

@@ -13,8 +13,8 @@
 	</style>
 	</style>
 	<script type="text/javascript">
 	<script type="text/javascript">
 		//失焦修改排序值
 		//失焦修改排序值
-		function upSoft(infoAd){
-			var soft=$("#soft").val();
+		function upSoft(infoAd,softs){
+			var soft=softs.value;
 			$.post("${ctx}/info/infoAd/update/soft",{'soft':soft,'InfoId':infoAd}, function(data) {
 			$.post("${ctx}/info/infoAd/update/soft",{'soft':soft,'InfoId':infoAd}, function(data) {
 				if(true==data.success){
 				if(true==data.success){
 					setTimeout(function () {
 					setTimeout(function () {
@@ -119,7 +119,7 @@
 					${infoAd.link}
 					${infoAd.link}
 				</td>
 				</td>
 				<td>
 				<td>
-					<input id="soft" type="number" value="${infoAd.soft}" maxlength="11" onblur="upSoft(${infoAd.id})">
+					<input id="soft" type="number" value="${infoAd.soft}" maxlength="11" onblur="upSoft(${infoAd.id},this)">
 <%--					<input value="${infoAd.soft}">	--%>
 <%--					<input value="${infoAd.soft}">	--%>
 				</td>
 				</td>
 				<td>
 				<td>