|
|
|
@ -339,6 +339,9 @@ public class PageController { |
|
|
|
} |
|
|
|
mv.addObject("depositoryCount", depositoryIdList.size()); |
|
|
|
Integer inventoryCountByDepository = materialService.findInventoryCountByDepository(depositoryIdList); |
|
|
|
if(inventoryCountByDepository == null){ |
|
|
|
inventoryCountByDepository = 0; |
|
|
|
} |
|
|
|
mv.addObject("allPrice",(int)(inventoryCountByDepository / 100)); |
|
|
|
mv.addObject("allMaterial", materialService.findMaterialCount(new HashMap<>())); |
|
|
|
/** |
|
|
|
@ -2950,6 +2953,7 @@ public class PageController { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/notice/notice-view"); |
|
|
|
|
|
|
|
|
|
|
|
NoticeP noticeById = noticeService.findNoticeById(id); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
if (token == null) { |
|
|
|
|