| 
					
				 | 
			
			
				@@ -2,6 +2,7 @@ package com.gree.mall.manager.utils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import cn.hutool.core.date.DateUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import cn.hutool.core.util.StrUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.bean.admin.AdminWebsitBean; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.commonmapper.WebsitMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.gree.mall.manager.constant.DailyConstant; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -125,7 +126,7 @@ public class CommonUtils { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public static String getYear(HttpServletRequest request){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String orderYear = request.getHeader("orderYear"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(StringUtils.isBlank(orderYear)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(StrUtil.isBlankOrUndefined(orderYear)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) { 
			 |