Merge remote-tracking branch 'origin/master'

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

@@ -369,7 +369,6 @@ public class SceneGeneralTemplateService {
         //删除测试包中场景
         SceneDeleteParam parm=new SceneDeleteParam();
         parm.setModifyUserId(AuthUtil.getCurrentUserId());
-
         Set<String> set = new HashSet<>();
         for (String id: idS) {
             parm.setModifyTime(TimeUtil.getNowForMysql());

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

@@ -159,6 +159,7 @@ public class ScenePackageService {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
             }
         }
+        po.setIsUnavailable("0");
         scenePackageMapper.updateScenePackage(po);
         scenePackageSublistMapper.deleteScenePackageSublist(po.getPackageId());
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);

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

@@ -8,12 +8,12 @@
         (package_id, package_code, package_name, weight,
          package_and_rules, scene_num, remarks,
          create_user_id, create_time, modify_user_id, modify_time,
-         is_deleted, share, tree_node)
+         is_deleted, share, tree_node,is_unavailable)
         values (#{packageId,jdbcType=VARCHAR}, #{packageCode,jdbcType=VARCHAR}, #{packageName,jdbcType=VARCHAR},
                 #{weight,jdbcType=VARCHAR},
                 #{packageAndRules,jdbcType=VARCHAR}, #{sceneNum}, #{remarks,jdbcType=VARCHAR},
                 #{createUserId,jdbcType=VARCHAR}, #{createTime}, #{modifyUserId,jdbcType=VARCHAR}, #{modifyTime},
-                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR})
+                #{isDeleted,jdbcType=VARCHAR}, #{share,jdbcType=VARCHAR}, #{treeNode,jdbcType=VARCHAR},'0')
     </insert>
 
 
@@ -23,7 +23,7 @@
         a.package_id,a.package_name,a.weight,a.package_code,
         a.package_and_rules,a.scene_num,a.remarks,
         a.create_user_id,a.create_time,a.modify_user_id,a.modify_time,
-        a.is_deleted,a.share,a.tree_node
+        a.is_deleted,a.share,a.tree_node,a.is_unavailable
         from simulation.scene_package as a
         <where>
             a.is_deleted = '0'
@@ -133,6 +133,9 @@
             <if test="treeNode != null and treeNode!=''">
                 tree_node = #{treeNode},
             </if>
+            <if test="isUnavailable != null and isUnavailable!=''">
+                is_unavailable = #{isUnavailable},
+            </if>
         </set>
         where package_id = #{packageId,jdbcType=VARCHAR}
     </update>