|
@@ -155,7 +155,9 @@ public class RelationContactFacade extends RelationServiceImpl {
|
|
|
|
|
|
QueryWrapper<Relation> relationQe = new QueryWrapper<>();
|
|
|
relationQe.eq("start_id", conceptId);
|
|
|
- relationQe.eq(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null,"relation_id", relationNodeVO.getSonRelationId());
|
|
|
+ if(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null){
|
|
|
+ relationQe.eq("relation_id", relationNodeVO.getSonRelationId());
|
|
|
+ }
|
|
|
List<Relation> relationList = list(relationQe);
|
|
|
|
|
|
if(ListUtil.isNotEmpty(relationList)){
|
|
@@ -250,6 +252,9 @@ public class RelationContactFacade extends RelationServiceImpl {
|
|
|
if(ListUtil.isNotEmpty(relationIds)){
|
|
|
relationId = relationIds.remove(0);
|
|
|
}
|
|
|
+ if(relationId==null){
|
|
|
+ relationId = -999999l;
|
|
|
+ }
|
|
|
if(ListUtil.isNotEmpty(typeIds)){
|
|
|
endTypeId = typeIds.remove(0);
|
|
|
}
|