|
@@ -155,7 +155,7 @@ public class PostServiceImpl implements PostService {
|
|
|
PcProfession proOther = pcProfessionMapper.selectByExample(proEmp).stream().findFirst().orElse(null);
|
|
|
if (proOther != null) {
|
|
|
proEmp = new PcProfessionExample();
|
|
|
- proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID());
|
|
|
+ proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID()).andProfessionNameIsNotNull();
|
|
|
// proCia.andProfessionNameEqualTo(data.getProfessionName());
|
|
|
|
|
|
//查询其他岗位
|
|
@@ -407,7 +407,7 @@ public class PostServiceImpl implements PostService {
|
|
|
proCia.andProfessionNameEqualTo("其他");
|
|
|
PcProfession proOther = pcProfessionMapper.selectByExample(proEmp).stream().findFirst().orElse(null);
|
|
|
proEmp = new PcProfessionExample();
|
|
|
- proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID());
|
|
|
+ proEmp.or().andParentProfessionIDEqualTo(proOther.getProfessionID()).andProfessionNameIsNotNull();
|
|
|
//查询已存在的三级“其他”岗位
|
|
|
List<PcProfession> proOtherSonList = pcProfessionMapper.selectByExample(proEmp);
|
|
|
|