|
|
@@ -8,6 +8,7 @@ import java.util.Map;
|
|
8
|
8
|
import javax.annotation.Resource;
|
|
9
|
9
|
import javax.servlet.http.HttpServletRequest;
|
|
10
|
10
|
|
|
|
11
|
+import org.apache.commons.lang.ObjectUtils;
|
|
11
|
12
|
import org.springframework.beans.factory.annotation.Value;
|
|
12
|
13
|
import org.springframework.http.MediaType;
|
|
13
|
14
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -63,12 +64,12 @@ public class StorageDumpController {
|
|
63
|
64
|
Criteria criteria = example.createCriteria();
|
|
64
|
65
|
|
|
65
|
66
|
/* 仓房ID */
|
|
66
|
|
- if (null != houseId) {
|
|
|
67
|
+ if (null != houseId && !"".equals(houseId)) {
|
|
67
|
68
|
criteria.andHouseIdEqualTo(houseId);
|
|
68
|
69
|
}
|
|
69
|
70
|
|
|
70
|
71
|
/* 货位id */
|
|
71
|
|
- if (null != wareId) {
|
|
|
72
|
+ if (null != wareId && !"".equals(wareId)) {
|
|
72
|
73
|
criteria.andWareIdEqualTo(wareId);
|
|
73
|
74
|
}
|
|
74
|
75
|
|