|  | @@ -54,16 +54,19 @@ public class JieShouHuiZhenService {
 | 
	
		
			
				|  |  |          Set<String> deptList = publicServer.getChildDeptByUserCode();
 | 
	
		
			
				|  |  |          QueryWrapper<?> qw = new QueryWrapper<>();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        String dateName = "req_date";
 | 
	
		
			
				|  |  |          if (history) {
 | 
	
		
			
				|  |  |              qw.eq("status_flag", "2");
 | 
	
		
			
				|  |  | +            dateName = "hz_date";
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |              qw.eq("status_flag", "1");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          if (StringUtil.notBlank(startTime)) {
 | 
	
		
			
				|  |  | -            qw.gt("req_date", startTime)
 | 
	
		
			
				|  |  | -                    .le("req_date", endTime);
 | 
	
		
			
				|  |  | +            qw.gt(dateName, startTime)
 | 
	
		
			
				|  |  | +                    .le(dateName, endTime);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          if (publicServer.noNeedRule()) {
 | 
	
		
			
				|  |  |              qw.in("req_dept1", deptList);
 | 
	
		
			
				|  |  |          }
 |