修改bug

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -721,27 +721,35 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             if (contractInfo != null) {
                 /* =========================== 施工合同段 =========================== */
                 if (new Integer(1).equals(contractInfo.getContractType())) {
-                    String condition="AND";
-                    if(StringUtil.isEmpty(description)){
-                        condition="AND a.is_buss_show!=2 AND";
-                    }
                     String sql = "SELECT is_custom,p_key_id,contract_id," +
                             "(SELECT id FROM u_contract_tree_drawings WHERE process_id = p_key_id AND is_deleted = 0 limit 1) AS drawingsId," +
                             "id,parent_id,node_type,type,wbs_type,is_buss_show as isBussShow,is_concrete,major_data_type,partition_code,old_id,contract_id_relation,is_concealed_works_node," +
                             "CASE (SELECT count(1) FROM u_tree_contract_first AS tcf WHERE tcf.is_deleted = 0 AND tcf.wbs_node_id = a.p_key_id) " +
                             "WHEN 0 THEN 'false' ELSE 'true' END AS isFirst,IFNULL(if(length(trim(full_name))>0,full_name,node_name),node_name) AS title," +
                             "(SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_wbs_tree_contract b WHERE b.parent_id = a.id AND b.type = 1" +
-                            " AND b.status = 1 AND b.contract_id = " + contractId + " AND b.is_deleted = 0 ) AS hasChildren," +
+                            " AND b.status = 1 AND b.contract_id = " + contractId + " AND b.is_deleted = 0) AS hasChildren," +
                             "(SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_wbs_tree_contract b WHERE b.parent_id = a.id AND b.type = 1" +
-                            " AND b.status = 1 AND b.contract_id = " + contractId + " AND b.is_deleted = 0 AND is_custom = 1) AS isCustomChild " +
-                            "FROM m_wbs_tree_contract a WHERE a.node_type != 111 AND a.type = 1 AND a.status = 1  "+condition+"  a.is_deleted = 0 " +
+                            " AND b.status = 1 AND b.contract_id = " + contractId + " AND b.is_deleted = 0 AND is_custom = 1 ) AS isCustomChild " +
+                            "FROM m_wbs_tree_contract a WHERE a.node_type != 111 AND a.type = 1 AND a.status = 1  And  a.is_deleted = 0 " +
                             "AND parent_id = " + (StringUtils.isNotEmpty(id) ? id : 0) + " AND contract_id = " + contractId + " " +
                             "ORDER BY a.sort,title,a.create_time";
-                    System.out.println(sql);
+
                     List<WbsTreeContractLazyVO> lazyNodes = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreeContractLazyVO.class));
+                    //资料填报 不返回已隐藏的节点
+                    if(StringUtil.isEmpty(description)){
+                        List<WbsTreeContractLazyVO>isBussShowNodes=new ArrayList<>();
+                        for (WbsTreeContractLazyVO lazyNode : lazyNodes) {
+                            if(ObjectUtil.isNotEmpty(lazyNode.getIsBussShow())){
+                                if(lazyNode.getIsBussShow().equals("2")){
+                                    isBussShowNodes.add(lazyNode);
+                                }
+                            }
+                        }
+                        if(isBussShowNodes.size()>0){
+                            lazyNodes.removeAll(isBussShowNodes);
+                        }
+                    }
                     if (lazyNodes.size() > 0) {
-
-
                         /*获取当前合同段节点本地缓存信息*/
                         List<WbsTreeContractLazyVO> nodesAll = this.getNodeAll(contractId);
                         List<WbsTreeContractLazyVO> distinctNodesAll = nodesAll.stream()