|  | @@ -80,10 +80,7 @@ public interface FsUserMapper
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      public int deleteFsUserByUserIds(Long[] userIds);
 | 
	
		
			
				|  |  |      @Select({"<script> " +
 | 
	
		
			
				|  |  | -                "select f1.*,f2.nick_name tui_name,f2.phone tui_phone,cu.nick_name AS companyUserNickName,co.company_name FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id "+
 | 
	
		
			
				|  |  | -            " LEFT JOIN fs_user_company_user cuc ON cuc.user_id = f1.user_id\n" +
 | 
	
		
			
				|  |  | -            " LEFT JOIN company_user cu ON cu.user_id = cuc.company_user_id\n" +
 | 
	
		
			
				|  |  | -            " LEFT JOIN company co ON co.company_id = cuc.company_id "+
 | 
	
		
			
				|  |  | +                "select f1.*,f2.nick_name tui_name,f2.phone tui_phone FROM fs_user f1 LEFT JOIN fs_user f2 ON f1.tui_user_id =f2.user_id "+
 | 
	
		
			
				|  |  |              " where f1.is_del=0 "+
 | 
	
		
			
				|  |  |              "  <if test=\"nickName != null  and nickName != ''\"> and f1.nick_name like concat( #{nickName}, '%')</if>\n" +
 | 
	
		
			
				|  |  |              "            <if test=\"avatar != null  and avatar != ''\"> and f1.avatar = #{avatar}</if>\n" +
 | 
	
	
		
			
				|  | @@ -99,8 +96,6 @@ public interface FsUserMapper
 | 
	
		
			
				|  |  |              "            <if test=\"loginDevice != null  and loginDevice != ''\"> and f1.login_device = #{loginDevice}</if>\n" +
 | 
	
		
			
				|  |  |              "            <if test=\"sTime != null \">  and DATE(f1.create_time) >= DATE(#{sTime})</if>\n" +
 | 
	
		
			
				|  |  |              "            <if test=\"eTime != null \">  and DATE(f1.create_time) <= DATE(#{eTime})</if>\n" +
 | 
	
		
			
				|  |  | -            "            <if test=\"companyId != null \">and co.company_id = #{companyId}</if>\n" +
 | 
	
		
			
				|  |  | -            "            <if test=\"companyUserId != null \">and cuc.company_user_id = #{companyUserId}</if>\n" +
 | 
	
		
			
				|  |  |              "order by f1.user_id desc"+
 | 
	
		
			
				|  |  |              "</script>"})
 | 
	
		
			
				|  |  |      @Results({
 |