lyhzzz 2 년 전
부모
커밋
888c0b0e1f

+ 8 - 6
src/main/java/com/fdkankan/fusion/service/impl/CaseNumServiceImpl.java

@@ -175,12 +175,14 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     }
 
     private void deleteByNum(Integer caseId, List<String> delList) {
-        LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CaseNumEntity::getCaseId,caseId);
-        wrapper.in(CaseNumEntity::getNum,delList);
-        this.remove(wrapper);
-        fusionNumService.deleteByNumList(caseId,delList);
-        caseViewService.deleteByNumList(caseId,delList);
+        if(delList.size() >0){
+            LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(CaseNumEntity::getCaseId,caseId);
+            wrapper.in(CaseNumEntity::getNum,delList);
+            this.remove(wrapper);
+            fusionNumService.deleteByNumList(caseId,delList);
+            caseViewService.deleteByNumList(caseId,delList);
+        }
     }
 
     @Override

+ 2 - 2
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -76,7 +76,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         if(com.fdkankan.fusion.common.util.StringUtils.isChinese(fileName)){
             throw new BusinessException(ResultCode.UPLOAD_FILE_CHINA_NAME);
         }
-        if(!fileName.toLowerCase().contains("zip")){
+        if(!fileName.toLowerCase().endsWith(".zip")){
             throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
         }
         //获取文件后缀名
@@ -98,7 +98,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             newObjFile.mkdirs();
         }
         file.transferTo(newObjFile);
-        if(fileName.toLowerCase().contains("zip")){
+        if(fileName.toLowerCase().endsWith(".zip")){
             ShellUtil.unZip(newObjFile.getPath(),objPath);
         }
         objPathFile = new File(objPath );