1、app端修改固有现状风险编辑报错问题

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -349,6 +349,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //风险源照片
+        if ("null".equals(saveDto.getPictureFileIds())){
+            saveDto.setPictureFileIds(null);
+        }
         if (pictureFile != null) {
             String pictureFileIds = Arrays.stream(pictureFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -361,6 +364,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //工程技术措施附件
+        if ("null".equals(saveDto.getMeasuresProjectFileIds())){
+            saveDto.setMeasuresProjectFileIds(null);
+        }
         if (measuresProjectFile != null) {
             String measuresProjectFileIds = Arrays.stream(measuresProjectFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -373,6 +379,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //管理措施附件
+        if ("null".equals(saveDto.getMeasuresAdministrationFileIds())){
+            saveDto.setMeasuresAdministrationFileIds(null);
+        }
         if (measuresAdministrationFile != null) {
             String measuresAdministrationFileIds = Arrays.stream(measuresAdministrationFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -385,6 +394,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //应急处置措施附件
+        if ("null".equals(saveDto.getMeasuresEmergencyFileIds())){
+            saveDto.setMeasuresEmergencyFileIds(null);
+        }
         if (measuresEmergencyFile != null) {
             String measuresEmergencyFileIds = Arrays.stream(measuresEmergencyFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -457,6 +469,9 @@ public class RiskPlanAppController extends BaseController {
 
 
         //风险源照片
+        if ("null".equals(saveDto.getPictureFileIds())){
+            saveDto.setPictureFileIds(null);
+        }
         if (pictureFile != null) {
             String pictureFileIds = Arrays.stream(pictureFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -469,6 +484,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //工程技术措施附件
+        if ("null".equals(saveDto.getMeasuresProjectFileIds())){
+            saveDto.setMeasuresProjectFileIds(null);
+        }
         if (measuresProjectFile != null) {
             String measuresProjectFileIds = Arrays.stream(measuresProjectFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -481,6 +499,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //管理措施附件
+        if ("null".equals(saveDto.getMeasuresAdministrationFileIds())){
+            saveDto.setMeasuresAdministrationFileIds(null);
+        }
         if (measuresAdministrationFile != null) {
             String measuresAdministrationFileIds = Arrays.stream(measuresAdministrationFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())
@@ -493,6 +514,9 @@ public class RiskPlanAppController extends BaseController {
         }
 
         //应急处置措施附件
+        if ("null".equals(saveDto.getMeasuresEmergencyFileIds())){
+            saveDto.setMeasuresEmergencyFileIds(null);
+        }
         if (measuresEmergencyFile != null) {
             String measuresEmergencyFileIds = Arrays.stream(measuresEmergencyFile)
                     .filter(multipartFile -> !multipartFile.isEmpty())