|
|
@ -568,11 +568,13 @@ public class PageController { |
|
|
Depository depositoryRecordById = new Depository(); |
|
|
Depository depositoryRecordById = new Depository(); |
|
|
if (mid != null) { |
|
|
if (mid != null) { |
|
|
materialById = materialService.findMaterialById(mid); |
|
|
materialById = materialService.findMaterialById(mid); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
if (depositoryId != null) { |
|
|
if (depositoryId != null) { |
|
|
depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId); |
|
|
depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId); |
|
|
} |
|
|
} |
|
|
|
|
|
if(materialById.getShelfLife() == null){ |
|
|
|
|
|
mv.addObject("display","none"); |
|
|
|
|
|
} |
|
|
mv.addObject("materialById", materialById); |
|
|
mv.addObject("materialById", materialById); |
|
|
mv.addObject("depository", depositoryRecordById); |
|
|
mv.addObject("depository", depositoryRecordById); |
|
|
mv.setViewName("pages/application/application-in_back"); |
|
|
mv.setViewName("pages/application/application-in_back"); |
|
|
|