脏数据处理

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpTemplateNodesServiceImpl.java

@@ -88,9 +88,11 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
             for (String projectid : zhcxItpTemplateNodeSyncProjectVo.getProjectids()) {
                 // 根据名称判断
                 String sql1 = "select a.NODENAME AS \"NAMEONE\",a.ID AS \"IDONE\",b.NODENAME AS \"NAMETWO\",b.ID AS \"IDTWO\",c.NODENAME AS \"NAMETHREE\",c.ID AS \"IDTHREE\"\n" +
+                        ",e.ID AS \"PNODEID\",e.NODENAME AS \"PNODENAME\"" +
                         "from ZHCX_ITP_TEMPLATE_NODES a \n" +
                         "left join ZHCX_ITP_TEMPLATE_NODES b on a.pid=b.id\n" +
                         "left join ZHCX_ITP_TEMPLATE_NODES c on b.pid=c.id\n" +
+                        "left join ZHCX_ITP_TEMPLATE_NODES e on a.PNODEID=e.id\n" +
                         "where a.ID='"+zhcxItpTemplateNodeSyncProjectVo.getNodeid()+"'";
                 List<Map<String, Object>> nodes = commonSqlDao.sqlExecutu(sql1);
                 // 1级
@@ -105,11 +107,12 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
                         zhcxItpProjectNodesService.updateById(node1);
                     }
 
-                    // 2级
+                    // 2级，构件需要考虑归属大构件的名称是否也一样
                     List<String> a = new ArrayList<>();
                     a.add(CxConstants.ITP_NODETYPE_SMALL);a.add(CxConstants.ITP_NODETYPE_BIG);
                     List<ZhcxItpProjectNodesDo> nametwo = zhcxItpProjectNodesService.list(new LambdaQueryWrapper<ZhcxItpProjectNodesDo>()
                             .eq(ZhcxItpProjectNodesDo::getProjectid, projectid).in(ZhcxItpProjectNodesDo::getNodetype,a)
+                            .eq(ZhcxItpProjectNodesDo::getPnodename,nodes.get(0).get("PNODENAME"))
                             .eq(ZhcxItpProjectNodesDo::getNodename, nodes.get(0).get("NAMETWO")).eq(ZhcxItpProjectNodesDo::getPid,namethree.get(0).getId()));
                     if(nametwo != null && nametwo.size()>0){
                         if(!nametwo.get(0).getItpnodeid().equals(nodes.get(0).get("IDTWO"))){