提示信息关联标签可为空

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -122,8 +122,12 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         List<Long> questionIds = introduceVO.getMapVOList().stream().map(introduceMapVO -> introduceMapVO.getQuestionId()).collect(Collectors.toList());
         Long introudceId = introduceInfo.getId();
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
-        introduceMapUpdateWrapper.and(i -> i.eq("introduce_id", introudceId).or().in("question_id", questionIds)).
-                eq("is_deleted", IsDeleteEnum.N.getKey()).
+        if (ListUtil.isNotEmpty(questionIds)) {
+            introduceMapUpdateWrapper.and(i -> i.eq("introduce_id", introudceId).or().in("question_id", questionIds));
+        } else {
+            introduceMapUpdateWrapper.eq("introduce_id", introudceId);
+        }
+        introduceMapUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 set("is_deleted", IsDeleteEnum.Y.getKey()).
                 set("modifier", UserUtils.getCurrentPrincipleID()).
                 set("gmt_modified", DateUtil.now());
@@ -193,6 +197,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      */
     public Boolean deleteRecords(List<IdVO> idVOList) {
         List<Long> ids = idVOList.stream().map(idVO -> idVO.getId()).collect(Collectors.toList());
+        if (ListUtil.isEmpty(ids)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入提示信息id");
+        }
         //删除已有映射关系
         UpdateWrapper<IntroduceMap> introduceMapUpdateWrapper = new UpdateWrapper<>();
         introduceMapUpdateWrapper.in("introduce_id", ids).
@@ -277,7 +284,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         List<IntroduceMap> introduceMapList = introduceMapFacade.list(introduceMapQueryWrapper);
 
         List<Long> questionIds = introduceMapList.stream().map(introduceMap -> introduceMap.getQuestionId()).collect(Collectors.toList());
-        if(ListUtil.isNotEmpty(questionIds)) {
+        if (ListUtil.isNotEmpty(questionIds)) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
             questionInfoQueryWrapper.in("id", questionIds).eq("is_deleted", IsDeleteEnum.N.getKey());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
@@ -309,9 +316,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introducePageDTO.setUnRelatedQuestionList(unRelatedQuestionDTOList);*/
 
         //提示信息明细
-        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper=new QueryWrapper<>();
-        introduceDetailQueryWrapper.eq("is_deleted",IsDeleteEnum.N).eq("introduce_id",id).orderByAsc("order_no");
-        List<IntroduceDetail> introduceDetailList=introduceDetailFacade.list(introduceDetailQueryWrapper);
+        QueryWrapper<IntroduceDetail> introduceDetailQueryWrapper = new QueryWrapper<>();
+        introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N).eq("introduce_id", id).orderByAsc("order_no");
+        List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
         introducePageDTO.setDetails(introduceDetailList);
 
         return introducePageDTO;