commit

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneReferenceLibService.java

@@ -366,6 +366,7 @@ public class SceneReferenceLibService {
             testPackages.forEach(testPackage -> testPackage.setIsUnavailable(DictConstants.IS_UNAVAILABLE));
             // 4 遍历删除场景
             AtomicInteger deleteNum = new AtomicInteger();
+            deleteNum.set(0);
             indexes.forEach(index -> {
                 final String sceneReferenceLibIdsStr = index.getSceneReferenceLibIds();
                 List<String> sceneReferenceLibIds = new ArrayList<>();
@@ -426,7 +427,7 @@ public class SceneReferenceLibService {
         } finally {
             //* -------------------------------- 日志表 --------------------------------
             map.put("sceneNames", JsonUtil.listToJson(sceneNames));
-            map.put("type", DictConstants.SCENE_NATURAL);
+            map.put("type", DictConstants.SCENE_REFERENCE_LIB);
             logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
         }
     }

simulation-resource-server/src/main/resources/mysql/mapper/ScenePackageSublistMapper.xml

@@ -188,7 +188,7 @@
 
     </select>
     <select id="selectBySceneIds" resultType="api.common.pojo.po.scene.ScenePackageSublistPO">
-        select sublist_id, scene_natural_ids, scene_traffic_ids, scene_statue_ids, scene_generalization_ids
+        select sublist_id, scene_natural_ids, scene_traffic_ids, scene_statue_ids, scene_generalization_ids, scene_reference_lib_ids, scene_num
         from scene_package_sublist
         where is_deleted = '0' and
         <if test='sceneType == "1"'>
@@ -206,7 +206,7 @@
                 scene_traffic_ids like concat('%',#{item},'%')
             </foreach>
         </if>
-        <if test='sceneType == "4"'>
+        <if test='sceneType == "5"'>
             <foreach item="item" collection="sceneIds" separator=" or " open="(" close=")">
                 scene_reference_lib_ids like concat('%',#{item},'%')
             </foreach>