Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -1012,7 +1012,7 @@
         SELECT
             p_key_id id,
             p_key_id code,
-            node_name name,
+            IFNULL(if(length(trim(full_name))>0,full_name,node_name),node_name) name,
             null stake,
             case
                 when node_type = 1 then null
@@ -1039,6 +1039,7 @@
           AND type = #{type}
           AND p_id > 0
           AND contract_id = #{contractId}
+          AND ancestors_p_id is not null
         <if test="pid != null and pid != ''">
             AND find_in_set(#{pid}, ancestors_p_id)
         </if>