Merge branch 'dev'

src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -321,9 +321,10 @@ public class ProductController {
     @RequestMapping(value = "/assign/batch", method = RequestMethod.POST)
     @ResponseBody
     public String assignPersonalProductByBatch(@RequestParam Long userUU, @RequestBody String productId) throws UnsupportedEncodingException {
+        logger.log("进入", "准备批量分配个人物料,物料：" + productId, null, userUU, null, null);
         List<Long> productIds = JSONObject.parseArray(URLDecoder.decode(productId, "utf-8"), Long.class);
         productService.assignPersonalProducts(userUU, productIds);
-        logger.log("成功", "批量分配个人物料成功,物料id：" + productIds, null, userUU, null, null);
+        logger.log("成功", "批量分配个人物料成功,物料：" + productIds, null, userUU, null, null);
         return "success";
     }
 

src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -1055,12 +1055,11 @@ public class ProductServiceImpl implements ProductService {
         }
         Long enuu = null;
         for (Long id : productIds) {
-            Product product = productDao.getOne(id);
+            Product product = productDao.findOne(id);
             if (product != null) {
                 enuu = product.getEnUU();
                 break;
             }
-
         }
         //筛选已经存在个人物料库的信息
         if (!CollectionUtils.isEmpty(productIds)) {