Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/dao/weixin/user/dao/impl/UserQueryImpl.java

@@ -63,10 +63,10 @@ public class UserQueryImpl implements  UserQueryDao {
 			//管理合伙人
 			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.state=1 and t.lib_id is not null  and (t.lib_id=? or (t.type BETWEEN 1 and 4 or t.type = 6) ) )   ");
 			queryParams.add(searchParams.get("libId"));
-		}else if("6".equals(type)){
+		}else if("4".equals(type)){
 			//一对一校长
-			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.state=1  and t.lib_id=? and t.type=6 )   ");
-			queryParams.add(searchParams.get("libId"));
+			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.state=1  and  t.type=4 )   ");
+			//queryParams.add(searchParams.get("libId"));
 		}else if("2".equals(type)){
 			//学习导师（在馆老师）
 			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.state=1 and t.lib_id =?  and t.type =? )   ");
@@ -76,7 +76,7 @@ public class UserQueryImpl implements  UserQueryDao {
 			//图书馆馆长以及馆长助理
 			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.lib_id is not null and t.state=1 and (t.type BETWEEN 0 and 1))    ");
 		}else{
-			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.lib_id is not null and t.state=1 and t.type<>6)   ");
+			selSQL.append("  from  tb_user  u  where not exists (select 1 from tb_lib_manager t where t.user_id = u.id and t.lib_id is not null and t.state=1 )   ");
 		}
 
 		if (searchParams.get("name") != null && !searchParams.get("name").equals("")) {