Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -437,12 +437,14 @@ public class CommonServiceImpl implements ICommonService {
         if(sceneEditControls == null){
             sceneEditControls = new SceneEditControls();
             sceneEditControls.setEditInfoId(sceneEditInfo.getId());
-            Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
-            if(mapStatus == 1){
-                sceneEditControls.setShowMap(3);
-            }
-            sceneEditControlsService.save(sceneEditControls);
         }
+        Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
+        if(mapStatus == 1){
+            sceneEditControls.setShowMap(3);
+            sceneEditControls.setUpdateTime(null);
+        }
+        sceneEditControlsService.saveOrUpdate(sceneEditControls);
+
         if(sceneEditInfoExt == null){
             sceneEditInfoExt = new SceneEditInfoExt();
             sceneEditInfoExt.setScenePlusId(scenePlus.getId());