diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java index 4c77554..b9ca15b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java @@ -12,4 +12,8 @@ public interface ErrorMessageConstant { * "已启用禁用模板不能进行修改" */ public static final String ENABLE_DISABLE_TEMPLATE_NOT_MODIFY = "已启用禁用模板不能进行修改"; + /** + * "请选择上级品类" + */ + public static final String PLEASE_SELECT_SUPERIOR_CATEGORY = "请选择上级品类"; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java index 30579cc..be5f905 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java @@ -30,18 +30,19 @@ public class FileController { public Map upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) { String baseUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); String oldName= file.getOriginalFilename(); - String filename = fileStorageService.storeFile(file); - String fileUrl = baseUrl+"/files/" + filename; - - Map response = new HashMap<>(); - response.put("fileName", oldName); - response.put("fileType", file.getContentType()); - response.put("fileSize", file.getSize()); - response.put("url", fileUrl); - response.put("filePath", uploadDir + "/"+filename); - + if(!file.isEmpty()){ + String filename = fileStorageService.storeFile(file); + String fileUrl = baseUrl+"/files/" + filename; + response.put("fileName", oldName); + response.put("fileType", file.getContentType()); + response.put("fileSize", file.getSize()); + response.put("url", fileUrl); + response.put("filePath", uploadDir + "/"+filename); + } return response; + + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java index 5375e43..bdbc868 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO; @@ -70,6 +71,9 @@ public class CoscoCategoryController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { + if(coscoCategory.getParentId()==null){ + BaseResponse.fail(ErrorMessageConstant.PLEASE_SELECT_SUPERIOR_CATEGORY); + } return BaseResponse.success(coscoCategoryService.insertCoscoCategory(coscoCategory)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java index 0923e48..c1e79a1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java @@ -63,13 +63,13 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl getPage(CoscoCategoryVO coscoCategory) { IPage p = new Page<>(coscoCategory.getBasePageRequest().getPageNo(), coscoCategory.getBasePageRequest().getPageSize()); - return coscoCategoryMapper.selectMyPage(p,coscoCategory); + return coscoCategoryMapper.selectMyPage(p, coscoCategory); } @Override public List selectCategoryTree(CoscoCategory coscoCategory) { List coscoCategories = coscoCategoryMapper.selectCoscoCategoryList(coscoCategory); - List cosco=new ArrayList<>(); + List cosco = new ArrayList<>(); for (CoscoCategory co : coscoCategories) { cosco.add(BeanUtil.toBean(co, CoscoCategoryVO.class)); } @@ -135,7 +135,7 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl deptIds=new ArrayList<>(); + List deptIds = new ArrayList<>(); deptIds.add("dep01"); coscoCategory.setDeptIds(deptIds); return selectCategoryTree(coscoCategory); @@ -172,5 +172,4 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl