Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2529,6 +2529,12 @@ public class InformationWriteQueryController extends BladeController {
         StringBuilder parentNodeName = new StringBuilder();
         this.currentNodeAllParent(parentNodeName, removeNode);
 
+        //判断是否子节点有上报或审批过的资料
+        List<InformationQuery> list = informationQueryService.selectChildrenNodeInfo(removeNode);
+        if (list != null && list.size() >= 1){
+            return R.data(300, false, "存在已经上报或审批的节点，不允许删除");
+        }
+
         //查询所有子节点
         List<WbsTreeContract> removeNodeList = jdbcTemplate.query("select p_key_id,type from m_wbs_tree_contract where is_deleted = 0 and contract_id = " + removeNode.getContractId() + " and ancestors like '%" + removeNode.getId() + "%'", new BeanPropertyRowMapper<>(WbsTreeContract.class));
         //获取pKeyId

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java

@@ -123,4 +123,5 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
     // 获取当前节点下,所有表单的字段数据,根据表名
     List<QueryProcessDataVO> getNodeChildTabColsAllByTabName(String tabName);
 
+    List<InformationQuery> selectChildrenNodeInfo(@Param("node") WbsTreeContract node);
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -832,5 +832,11 @@
                   in ( #{tabName} )
         GROUP BY table_name
     </select>
+    <select id="selectChildrenNodeInfo" resultType="org.springblade.business.entity.InformationQuery">
+        SELECT * FROM u_information_query
+        WHERE wbs_id in (SELECT p_key_id FROM m_wbs_tree_contract
+                        WHERE ancestors LIKE concat('%', #{node.id}, '%') AND  contract_id = #{node.contractId} AND is_deleted = 0 or p_key_id =#{node.pKeyId})
+        AND status IN (1,2)
+    </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IInformationQueryService.java

@@ -144,4 +144,5 @@ public interface IInformationQueryService extends BaseService<InformationQuery>
     //根据节点获取首件数据
     InformationQuery getFirstInfoByWbsId(String wbsId);
 
+    List<InformationQuery> selectChildrenNodeInfo(WbsTreeContract node);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -872,4 +872,9 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
         return this.getOne(new LambdaQueryWrapper<InformationQuery>().eq(InformationQuery::getWbsId, wbsId).eq(InformationQuery::getStatus, 0).eq(InformationQuery::getType, 3).last("limit 1"));
     }
 
+    @Override
+    public List<InformationQuery> selectChildrenNodeInfo(WbsTreeContract node) {
+        return this.baseMapper.selectChildrenNodeInfo(node);
+    }
+
 }

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

@@ -396,6 +396,7 @@
         select matc1.*,if((SELECT COUNT(*) from m_archive_tree_contract matc WHERE matc.parent_id = matc1.id)=0,true,false)
             as notExsitChild
         from m_archive_tree_contract matc1 WHERE matc1.parent_id = #{nodeId} and matc1.is_deleted =0
+        ORDER BY sort
     </select>
     <select id="getAuthCodeList" resultMap="archiveTreeContractResultMap">
         SELECT