Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/SceneGeneralTemplateMapper.java

@@ -24,5 +24,5 @@ public interface SceneGeneralTemplateMapper {
     SceneGeneralTemplatePO querySceneGeneralTemplateByName(SceneGeneralTemplatePO sceneGeneralTemplatePO);
     void updateSceneGeneralTemplate(SceneGeneralTemplatePO po);
     //根据名称查询所有场景id
-    List<String> queryIdByScendId( String  scendId);
+    List<String> queryIdBySceneId( String  sceneId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneGeneralTemplateService.java

@@ -357,7 +357,7 @@ public class SceneGeneralTemplateService {
         po.setModifyTime(TimeUtil.getNowForMysql());
 
         //根据名称查询所有共有及私有场景
-        List<String>  idS=mapper.queryIdByScendId(po.getSceneId());
+        List<String>  idS=mapper.queryIdBySceneId(po.getSceneId());
         mapper.deleteSceneGeneralTemplateByScendId(po);
         //删除场景包
         SystemScenePackageSublistPO systemScenePackageSublistPO=new SystemScenePackageSublistPO();

simulation-resource-server/src/main/resources/mapper/scene/SceneGeneralTemplateMapper.xml

@@ -185,7 +185,7 @@
             </if>
             is_deleted = '1'
         </set>
-        where is_deleted = '0'  and scend_id=#{scendId}
+        where is_deleted = '0'  and scene_id=#{sceneId}
     </update>
 
     <select id="querySceneGeneralTemplateListByQx" parameterType="api.common.pojo.param.scene.SceneGeneralTemplateParam"
@@ -327,7 +327,7 @@
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
-    <select id="queryIdByScendId" resultType="java.lang.String">
-        select id from simulation.scene_general_template where scend_id=#{scendId} and is_deleted='0'
+    <select id="queryIdBySceneId" resultType="java.lang.String">
+        select id from simulation.scene_general_template where scene_id=#{sceneId} and is_deleted='0'
     </select>
 </mapper>