| 
														
															@@ -126,15 +126,12 @@ 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)){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return "2025"; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-       /* if(StrUtil.isBlankOrUndefined(orderYear)){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        if(StrUtil.isBlankOrUndefined(orderYear)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return ""; 
														 | 
														
														 | 
														
															             return ""; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) { 
														 | 
														
														 | 
														
															         if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             orderYear = ""; 
														 | 
														
														 | 
														
															             orderYear = ""; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        }*/ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return orderYear; 
														 | 
														
														 | 
														
															         return orderYear; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 |