| 
														
															@@ -126,10 +126,7 @@ public class CommonUtils { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     public static String getYear(HttpServletRequest request){ 
														 | 
														
														 | 
														
															     public static String getYear(HttpServletRequest request){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         String orderYear = request.getHeader("orderYear"); 
														 | 
														
														 | 
														
															         String orderYear = request.getHeader("orderYear"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if(StringUtils.isBlank(orderYear)){ 
														 | 
														
														 | 
														
															         if(StringUtils.isBlank(orderYear)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return ""; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            orderYear = ""; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return "2025"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return orderYear; 
														 | 
														
														 | 
														
															         return orderYear; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 |