| 
					
				 | 
			
			
				@@ -197,6 +197,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="contactAddress" column="contact_address_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="postalCode" column="postal_code_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <result property="organIdStr" column="organ_id_str_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="deptIds" column="dept_ids_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <result property="postIds" column="post_ids_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <collection property="roleNames" ofType="string" javaType="list"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <result column="role_name_"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </collection> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -207,7 +209,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="queryEmployByOrganId" resultMap="EmployeeDto"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_ids_,e.post_ids_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         FROM employee e 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         LEFT JOIN sys_user su ON e.user_id_ = su.id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="roleId != null"> 
			 |