| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -111,8 +111,8 @@ module.exports = function (app, opts) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                     AND department.name LIKE '%${keyword}%' | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					               ) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ` : ''}
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ${state == 'dimission' ? `AND member.dimission_date != '1970-01-01 00:00:00.000000'` : ''} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ${state == 'onJob' ? `AND member.dimission_date = '1970-01-01 00:00:00.000000'` : ''} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ${state == 'dimission' ? `AND member.dimission_date IS NOT null` : ''} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ${state == 'onJob' ? `AND member.dimission_date IS null` : ''} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ${whereFromSelectOption.length ? `AND ${whereFromSelectOption.join('AND')}` : ''} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					      ` | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -121,6 +121,7 @@ module.exports = function (app, opts) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            hrMember."member.pep_user_id" AS pepUserId, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            hrMember.*, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            user.name AS userName, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            user.people_code AS userCode, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            role.name AS roleName, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            role.id AS roleId, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            department.name AS depName, | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |