diff --git a/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java b/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java index e91284e..4bd69b9 100644 --- a/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java +++ b/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java @@ -71,7 +71,7 @@ public class CheckHeaderController extends BaseController { lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CheckHeader::getCreated, createdBegin) .le(StringUtils.isNotEmpty(createdEnd), CheckHeader::getCreated, createdEnd) .eq(CheckHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) - .eq(StringUtils.isNotNull(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode()) + .eq(StringUtils.isNotEmpty(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode()) .eq(StringUtils.isNotEmpty(checkHeader.getReferCode()), CheckHeader::getReferCode, checkHeader.getReferCode()) .eq(StringUtils.isNotEmpty(checkHeader.getStatus()), CheckHeader::getStatus, checkHeader.getStatus()) .in(StringUtils.isNotEmpty(checkHeader.getType()), CheckHeader::getType, types) diff --git a/src/main/java/com/huaheng/pc/config/corporation/controller/CorporationController.java b/src/main/java/com/huaheng/pc/config/corporation/controller/CorporationController.java index 96c29e5..f849b9b 100644 --- a/src/main/java/com/huaheng/pc/config/corporation/controller/CorporationController.java +++ b/src/main/java/com/huaheng/pc/config/corporation/controller/CorporationController.java @@ -209,8 +209,7 @@ public class CorporationController extends BaseController { Corporation corporation = corporationService.getById(ids); boolean ret = false; try { - String subPath = "img/corporation/" + corporation.getId() + "/"; - String savePath = corporation.getBaseAddress() + subPath; + String savePath = corporation.getBaseAddress() + corporation.getSubPath(); FileUtils.deleteDirectory(new File(savePath)); ret = corporationService.removeByIds(Arrays.asList(Convert.toIntArray(ids))); }catch (IOException e){