| 
					
				 | 
			
			
				@@ -15,27 +15,27 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                d.dept_name, d.leader, u1.user_name as leaderName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from sys_user u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from sys_user_info u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                  left join sys_dept d on u.dept_id = d.dept_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                 left join sys_user u1 on u1.user_id = d.leader 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                 left join sys_user_info u1 on u1.user_id = d.leader 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ${ew.getCustomSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectAllocatedList" resultMap="SysUserResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from sys_user u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from sys_user_info u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              left join sys_dept d on u.dept_id = d.dept_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              left join sys_user_role sur on u.user_id = sur.user_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-             left join sys_role r on r.role_id = sur.role_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             left join sys_role_info r on r.role_id = sur.role_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ${ew.getCustomSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectUnallocatedList" resultMap="SysUserResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from sys_user u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from sys_user_info u 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              left join sys_dept d on u.dept_id = d.dept_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              left join sys_user_role sur on u.user_id = sur.user_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-             left join sys_role r on r.role_id = sur.role_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             left join sys_role_info r on r.role_id = sur.role_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ${ew.getCustomSqlSegment} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |