wms / sanyizhongka · Commits

Commit aabe89f3d3d0d2cc4a33220fca534ba5c21b5ec0

Authored by mahuandong
2 parents dc59ca2f fdf78c0a

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java
  View file @aabe89f
... ... @@ -71,7 +71,7 @@ public class CheckHeaderController extends BaseController {
71 71 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CheckHeader::getCreated, createdBegin)
72 72 .le(StringUtils.isNotEmpty(createdEnd), CheckHeader::getCreated, createdEnd)
73 73 .eq(CheckHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
74   - .eq(StringUtils.isNotNull(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode())
  74 + .eq(StringUtils.isNotEmpty(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode())
75 75 .eq(StringUtils.isNotEmpty(checkHeader.getReferCode()), CheckHeader::getReferCode, checkHeader.getReferCode())
76 76 .eq(StringUtils.isNotEmpty(checkHeader.getStatus()), CheckHeader::getStatus, checkHeader.getStatus())
77 77 .in(StringUtils.isNotEmpty(checkHeader.getType()), CheckHeader::getType, types)
... ...
src/main/java/com/huaheng/pc/config/corporation/controller/CorporationController.java
  View file @aabe89f
... ... @@ -209,8 +209,7 @@ public class CorporationController extends BaseController {
209 209 Corporation corporation = corporationService.getById(ids);
210 210 boolean ret = false;
211 211 try {
212   - String subPath = "img/corporation/" + corporation.getId() + "/";
213   - String savePath = corporation.getBaseAddress() + subPath;
  212 + String savePath = corporation.getBaseAddress() + corporation.getSubPath();
214 213 FileUtils.deleteDirectory(new File(savePath));
215 214 ret = corporationService.removeByIds(Arrays.asList(Convert.toIntArray(ids)));
216 215 }catch (IOException e){
... ...