diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProjectServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProjectServiceImpl.java index 3c31638..bf28252 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProjectServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProjectServiceImpl.java @@ -60,8 +60,7 @@ public class TbProjectServiceImpl implements TbProjectService { */ @Override public List queryByPage(TbProject tbProject) { - List list = tbProjectDao.queryByPage(tbProject); - return list.stream().filter(project -> project.getProName() != null).collect(Collectors.toList()); + return tbProjectDao.queryByPage(tbProject); } /** diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml index 87551e7..7dd7bea 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml @@ -65,9 +65,6 @@ from tb_people tp left join sys_dict_data sda on tp.post_code = sda.dict_code where tp.del_flag = '0' - - and tp.rel_name = #{relName} - and tp.id_card = #{idCard}