Merge remote-tracking branch 'origin/dev1107' into dev1107

This commit is contained in:
yang
2024-11-30 12:11:41 +08:00
2 changed files with 10 additions and 3 deletions

View File

@@ -206,4 +206,8 @@ public class Teacher extends BaseEntity {
@Column(name = "expertise")
private String expertise;
@Column(name = "user_no",length = 1)
private Integer userNo;
}

View File

@@ -100,11 +100,14 @@ public class TeacherServiceImpl implements ITeacherService {
@Override
public List<Teacher> findByName(String name) {
String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
// String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
// hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
List<Teacher> teachers=new ArrayList<Teacher>();
try {
List<Object[]> list =dao.findListFields(hql,name);
List<Object[]> list =dao.findListFields(hql);
for(Object[] objs :list) {
Teacher t=new Teacher();
t.setId((String)objs[0]);