|
|
@@ -177,7 +177,7 @@ public class StorageFoodbasicInfoController {
|
|
177
|
177
|
Map<String, Object> map = new HashMap<>();
|
|
178
|
178
|
|
|
179
|
179
|
StorageFoodbasicinfo foodbasicinfo = new StorageFoodbasicinfo();
|
|
180
|
|
- if(houseId != null){
|
|
|
180
|
+ if(houseId != null && !"".equals(houseId)){
|
|
181
|
181
|
foodbasicinfo.setHouseId(houseId);
|
|
182
|
182
|
}
|
|
183
|
183
|
if(wareId != null){
|
|
|
@@ -187,7 +187,7 @@ public class StorageFoodbasicInfoController {
|
|
187
|
187
|
List<StorageFoodbasicinfo> basicInfo = foodbasicInfoService.selectByExample(foodbasicinfo);
|
|
188
|
188
|
|
|
189
|
189
|
if (null != basicInfo && basicInfo.size() > 0) {
|
|
190
|
|
- map.put("houseType", Integer.parseInt(basicInfo.get(0).getHouseType()));
|
|
|
190
|
+ map.put("houseType", Integer.parseInt(basicInfo.get(0).getHouseType()==null?"0":basicInfo.get(0).getHouseType()));
|
|
191
|
191
|
map.put("subType", basicInfo.get(0).getSubType());
|
|
192
|
192
|
map.put("recorder", basicInfo.get(0).getRecorder());
|
|
193
|
193
|
}
|