1

src/main/java/com/fdkankan/fusion/service/IFusionNumService.java

@@ -30,4 +30,6 @@ public interface IFusionNumService extends IService<FusionNum> {
     void deleteByCaseId(Integer caseId);
 
     void deleteByNumList(Integer caseId,List<String> updateNumList);
+
+    void deleteByModelId(Integer modelId);
 }

src/main/java/com/fdkankan/fusion/service/impl/FusionNumServiceImpl.java

@@ -211,6 +211,12 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
             }
         }
 
+    }
 
+    @Override
+    public void deleteByModelId(Integer modelId) {
+        LambdaQueryWrapper<FusionNum> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FusionNum::getModelId,modelId);
+        this.remove(wrapper);
     }
 }

src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -191,15 +191,17 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         List<CaseNumEntity> caseNumEntityList = caseNumService.getByNum(modelId.toString());
         List<FusionNum> fusionNumList = fusionNumService.getByNum(modelId.toString());
         if(caseNumEntityList.size() >0 || fusionNumList.size() >0){
-            List<Integer> caseIdIds = caseNumEntityList.parallelStream().map(CaseNumEntity::getCaseId).collect(Collectors.toList());
-            List<CaseEntity> list = caseService.getByIds(caseIdIds);
-            List<String> collect = list.parallelStream().map(CaseEntity::getCaseTitle).collect(Collectors.toList());
             StringBuilder title = new StringBuilder();
-            for (String str : collect) {
-                title.append(str).append(",");
-            }
-            if(title.length()>0){
-                title.delete(title.length()-1,title.length());
+            List<Integer> caseIdIds = caseNumEntityList.parallelStream().map(CaseNumEntity::getCaseId).collect(Collectors.toList());
+            if(caseIdIds.size() >0){
+                List<CaseEntity> list = caseService.getByIds(caseIdIds);
+                List<String> collect = list.parallelStream().map(CaseEntity::getCaseTitle).collect(Collectors.toList());
+                for (String str : collect) {
+                    title.append(str).append(",");
+                }
+                if(title.length()>0){
+                    title.delete(title.length()-1,title.length());
+                }
             }
             throw new BusinessException(ResultCode.CASE_USE.code, String.format(ResultCode.CASE_USE.msg,title));
         }
@@ -208,6 +210,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             throw new BusinessException(ResultCode.MODEL_NOT_EXIST);
         }
         this.removeById(modelId);
+        fusionNumService.deleteByModelId(modelId);
         if(StringUtils.isNotBlank(model.getModelGlbUrl())){
             uploadService.deleteOssUrl(model.getModelGlbUrl());
         }