|
@@ -12,6 +12,7 @@ import com.persagy.fm.common.model.vo.SimpleObjVO;
|
|
|
import com.persagy.fm.common.utils.ListUtil;
|
|
|
import com.persagy.fm.department.model.vo.DepSimpleObjVO;
|
|
|
import com.persagy.fm.department.service.IDepartmentService;
|
|
|
+import com.persagy.fm.depproject.model.DepProject;
|
|
|
import com.persagy.fm.person.dao.PersonMapper;
|
|
|
import com.persagy.fm.person.model.ConvertPersonTool;
|
|
|
import com.persagy.fm.person.model.Person;
|
|
@@ -1289,10 +1290,14 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
|
|
|
@Override
|
|
|
public IPage<ResponsePersonListItemVO> pageQueryByNameOrUserName(PageQueryPersonByNameOrUserNameDTO pageQueryPersonDTO) {
|
|
|
- List<Person> people = personMapper.queryPersonListByNameOrUserName(pageQueryPersonDTO);
|
|
|
- int total = personMapper.queryCountByNameOrUserName(pageQueryPersonDTO);
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
+ queryWrapper.like(Person.PROP_USERNAME, pageQueryPersonDTO.getName()).or(
|
|
|
+ wrapper -> wrapper.like(Person.PROP_NAME, pageQueryPersonDTO.getName())
|
|
|
+ );
|
|
|
+ IPage<Person> pageParam = new Page<>(pageQueryPersonDTO.getPage(), pageQueryPersonDTO.getSize(),true);
|
|
|
+ IPage<Person> result = getBaseMapper().selectPage(pageParam, queryWrapper);
|
|
|
|
|
|
- return packagePageResult(people, total);
|
|
|
+ return packagePageResult(result.getRecords(), Integer.parseInt(String.valueOf(result.getTotal())));
|
|
|
}
|
|
|
|
|
|
@Override
|