fix bug first remove

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -524,31 +524,31 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         JSONObject customMask = someDataJson.getJSONObject("customMask");
         JSONObject earth= customMask.getJSONObject("earth");
         JSONObject sky=customMask.getJSONObject("sky");
-            if (earth.containsKey("fodderId")&&ObjectUtil.isNotNull(earth.getLong("fodderId"))){
-                workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_earth);
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_earth);
+        if (earth.containsKey("fodderId")&&ObjectUtil.isNotNull(earth.getLong("fodderId"))){
                  saveOrEditFodder(entity, earth.getLong("fodderId"),SomeDataConstant.customMask_earth);
         }
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_sky);
+
         if (sky.containsKey("fodderId")&&ObjectUtil.isNotNull(sky.getLong("fodderId"))){
-                workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.customMask_sky);
                 saveOrEditFodder(entity, sky.getLong("fodderId"),SomeDataConstant.customMask_sky);
         }
 
         JSONObject backgroundMusic = someDataJson.getJSONObject("backgroundMusic");
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.backgroundMusic);
         if (backgroundMusic.containsKey("id")&&ObjectUtil.isNotNull(backgroundMusic.getLong("id"))){
-            workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.backgroundMusic);
             saveOrEditFodder(entity, backgroundMusic.getLong("id"),SomeDataConstant.backgroundMusic);
         }
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.logo);
         if (someDataJson.containsKey("logoId")&&ObjectUtil.isNotNull(someDataJson.getLong("logoId"))){
-            workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.logo);
             saveOrEditFodder(entity, someDataJson.getLong("logoId"),SomeDataConstant.logo);
         }
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.pcIcon);
         if (someDataJson.containsKey("pcIconId")&&ObjectUtil.isNotNull(someDataJson.getLong("pcIconId"))){
-            workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.pcIcon);
             saveOrEditFodder(entity, someDataJson.getLong("pcIconId"),SomeDataConstant.pcIcon);
         }
-
+        workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.appIcon);
         if (someDataJson.containsKey("appIconId")&&ObjectUtil.isNotNull(someDataJson.getLong("appIconId"))){
-            workHotsFodderService.removeByWorkIdAndType(entity.getId(), SomeDataConstant.appIcon);
             saveOrEditFodder(entity, someDataJson.getLong("appIconId"),SomeDataConstant.appIcon);
         }