多层关联保存修改

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

@@ -26,6 +26,7 @@ import com.diagbot.service.RelationService;
 import com.diagbot.service.impl.RelationOrderServiceImpl;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.RelationContactDetailVO;
@@ -86,9 +87,11 @@ public class RelationContactFacade extends RelationServiceImpl {
 		}
 		
 		List<Long> relationIdList = repairRelationDataForDelBeforeAdd(relationNodeVO.getConceptId(), relationNodeVO.getSonRelationId());
-		QueryWrapper<RelationOrder> relationOrderQe = new QueryWrapper<>();
-		relationOrderQe.in("t_relation_id", relationIdList);
-		relationOrderFacade.remove(relationOrderQe);
+		if(ListUtil.isNotEmpty(relationIdList)){
+			QueryWrapper<RelationOrder> relationOrderQe = new QueryWrapper<>();
+			relationOrderQe.in("t_relation_id", relationIdList);
+			relationOrderFacade.remove(relationOrderQe);
+		}
 		
 		List<List<Relation>> relationGroupList = repairRelationDataForAdd(relationNodeVO);
 		String currentUser = UserUtils.getCurrentPrincipleID();

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -73,7 +73,7 @@
  		<if test="relationId!=null">
  			AND a.relation_id=#{relationId}
  		</if>
-		ORDER BY b.order_no DESC,a.gmt_modified DESC
+		ORDER BY b.order_no ASC,a.gmt_modified DESC
     </select>
     
     <select id="relationContactList" resultType="com.diagbot.dto.RelationContactListDTO">
@@ -121,7 +121,7 @@
 		t2.lib_name AS libName,
 		t4.name AS libType,
 		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
+		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no ASC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
 		t1.is_deleted AS isDeleted