杭宁接口

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -1605,9 +1605,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
                 //表的代码名称相同，就复制数据，例如：G10=G10
                 if (nodeNameRe.equals(nodeNameReJL)) {
-
                     String htmlStringJL = this.getHtmlString(pKeyIdJL);
-
                     //获取质检实体表对应数据
                     List<Map<String, Object>> mapsList = jdbcTemplate.queryForList("select * from " + initTabName + " where p_key_id = " + pKeyId);
                     if (mapsList.size() > 0) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -132,7 +132,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 List<WbsTreePrivate> wbsTreePrivates = baseMapper.selectList(wrapper);
                 if(wbsTreePrivates.size()>0){
                     //过滤出所有不为表单的节点,大于0，则不是最小节点
-                    if(wbsTreePrivates.stream().filter(o->o.getInitTableName()==null).collect(Collectors.toList()).size()>0){
+                    if(wbsTreePrivates.stream().filter(o->o.getType()==Integer.valueOf(1)).collect(Collectors.toList()).size()>0){
                         throw new ServiceException("该节点不是最小节点不能设置标准分类和单元名称");
                     }
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -143,7 +143,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             List<WbsTree> wbsTrees = baseMapper.selectList(Childeswrapper);
             if(wbsTrees.size()>0){
                 //过滤出所有不为表单的节点,大于0，则不是最小节点
-                if(wbsTrees.stream().filter(o->o.getInitTableName()==null).collect(Collectors.toList()).size()>0){
+                if(wbsTrees.stream().filter(o->o.getType()==Integer.valueOf(1)).collect(Collectors.toList()).size()>0){
                     throw new ServiceException("该节点不是最小节点不能设置标准分类和单元名称");
                 }
             }