Merge remote-tracking branch 'origin/dev/mapping20210603' into dev/mapping20210603

cdssman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -80,9 +80,12 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     }
                 }
             }
-            List<KlRelation> relationList = this.list(new QueryWrapper<KlRelation>()
-                    .in("start_id", sids)
-                    .eq("relation_id", rid));
+            List<KlRelation> relationList = Lists.newArrayList();
+            if(ListUtil.isNotEmpty(sids)){
+                relationList = this.list(new QueryWrapper<KlRelation>()
+                        .in("start_id", sids)
+                        .eq("relation_id", rid));
+            }
             List<Long> ids = relationList.stream().map(x -> x.getId()).collect(Collectors.toList());
             //先删除
             if (ListUtil.isNotEmpty(ids)) {

cdssman-service/src/main/resources/mapper/KlRelationMapper.xml

@@ -141,14 +141,14 @@
         <if test="relationId!=null">
             AND relation_id = #{relationId}
         </if>
-        ) k,
+        ) k LEFT JOIN
         kl_relation r
-        WHERE
+        ON
         k.endId = r.start_id
         AND k.relationId = r.relation_id
-        ) m,
+        ) m LEFT JOIN
         kl_concept kc
-        WHERE
+        ON
         m.medId = kc.id
     </select>
     <select id="findDisNameAll" resultType="com.diagbot.dto.GetAllForRelationDTO">