Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/BrandController.java

@@ -220,7 +220,12 @@ public class BrandController {
             e.printStackTrace();
             return R.error("导入失败！");
         }
-        brandService.uploadExcel(brandEntityList);
+        try {
+            brandService.uploadExcel(brandEntityList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error(e.getMessage());
+        }
         //上传文件
         return R.ok("导入成功！");
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/BrandServiceImpl.java

@@ -224,7 +224,8 @@ public class BrandServiceImpl implements BrandService {
                 }
                 CategoryEntity categoryEntity = categoryDao.queryObject(categoryId);
                 if (Objects.isNull(categoryEntity)) {
-                    throw new ServiceException("第" + (i + 1) + "行的该分类编号：【" + categoryEntity + "】不存在！");
+                    throw new ServiceException("第" + (i + 1) + "行的所属分类id" +
+                            "：【" + categoryId + "】不存在！");
                 }
 
 
@@ -245,7 +246,7 @@ public class BrandServiceImpl implements BrandService {
                 } else {
                     BrandEntity updateBrandEntity = brandDao.queryObject(brandId);
                     if (Objects.isNull(updateBrandEntity)) {
-                        throw new ServiceException("第" + (i + 1) + "行的该品牌编号：【" + updateBrandEntity + "】不存在！");
+                        throw new ServiceException("第" + (i + 1) + "行的该品牌编号：【" + brandId + "】不存在！");
                     }
                     BeanUtils.copyProperties(brandEntity,updateBrandEntity);
                     brandDao.update(updateBrandEntity);