Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
+import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,11 +80,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 		BeanUtils.copyProperties(query, safeTrouble);
 		safeTroubleMapper.insert(safeTrouble);
 
+		Boolean ret = ServletFileUpload.isMultipartContent(request);
 		//保存隐患图片 变量名称只能用file  不能修改
-		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
-		if (photos != null && photos.size() > 0) {
-			return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(),  photos);
+		if(ret){
+			List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
+			if (photos != null && photos.size() > 0) {
+				return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(),  photos);
+			}
 		}
+
 		return R.ok();
 	}
 
@@ -102,11 +107,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
 		BeanUtils.copyProperties(query, safeTrouble);
 		safeTroubleMapper.updateById(safeTrouble);
 
-		//保存隐患图片
-		List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
-		if (photos != null && photos.size() > 0) {
-			return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(),  photos);
+		Boolean ret = ServletFileUpload.isMultipartContent(request);
+		//保存隐患图片 变量名称只能用file  不能修改
+		if(ret){
+			List<MultipartFile>  photos = ((MultipartHttpServletRequest) request).getFiles("file");
+			if (photos != null && photos.size() > 0) {
+				return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(),  photos);
+			}
 		}
+
 		return R.ok();
 	}