Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/resources/mapper/TabLinkMapper.xml

@@ -256,7 +256,7 @@
     t1.applet_content, t1.is_custom
     from tab_link t1 left join  tab_link_scene t2 on t1.link_id = t2.link_id
     and t1.parent_id = #{parentId}
-    and (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} ))
+    and (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} and t2.status = 1 ))
     and t1.status = 1
   </select>
   <select id="treeByGic" resultMap="BaseResultMap">
@@ -264,7 +264,7 @@
     t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.status, t1.type, t1.object_type, t1.name, t1.h5_content,
     t1.applet_content, t1.is_custom
     from tab_link t1 left join  tab_link_scene t2 on t1.link_id = t2.link_id
-    where (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} ))
+    where (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} and t2.status = 1 ))
     and t1.status = 1
     <if test="objectType != null ">
         <if test="objectType == 1">