bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

联调

This commit is contained in:
mashuai 2024-09-20 16:53:24 +08:00
parent 4f81e40d57
commit 7f4997688c
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProjectServiceImpl.java
View File

@ -60,8 +60,7 @@ public class TbProjectServiceImpl implements TbProjectService {
*/ */
@Override @Override
public List<TbProjectVo> queryByPage(TbProject tbProject) { public List<TbProjectVo> queryByPage(TbProject tbProject) {
List<TbProjectVo> list = tbProjectDao.queryByPage(tbProject); return tbProjectDao.queryByPage(tbProject);
return list.stream().filter(project -> project.getProName() != null).collect(Collectors.toList());
} }
/** /**

3
bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml
View File

@ -65,9 +65,6 @@
from tb_people tp from tb_people tp
left join sys_dict_data sda on tp.post_code = sda.dict_code left join sys_dict_data sda on tp.post_code = sda.dict_code
where tp.del_flag = '0' where tp.del_flag = '0'
<if test="relName != null and relName != ''">
and tp.rel_name = #{relName}
</if>
<if test="idCard != null and idCard != ''"> <if test="idCard != null and idCard != ''">
and tp.id_card = #{idCard} and tp.id_card = #{idCard}
</if> </if>