|
@@ -65,11 +65,11 @@ public class UserQueryImpl implements UserQueryDao {
|
|
|
queryParams.add(searchParams.get("libId"));
|
|
|
}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.type=4 ) ");
|
|
|
+ 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 in (4,30,40,50) ) ");
|
|
|
//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 =? ) ");
|
|
|
+ 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 =?) or t.type in (30,40,50)) ) ");
|
|
|
queryParams.add(searchParams.get("libId"));
|
|
|
queryParams.add(searchParams.get("type"));
|
|
|
}else if("0".equals(type)||"1".equals(type)){
|