|
@@ -100,7 +100,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
.eq(ZhcxItpProjectNodesDo::getProjectid, projectid).eq(ZhcxItpProjectNodesDo::getNodetype, CxConstants.ITP_NODETYPE_PHASE)
|
|
|
.eq(ZhcxItpProjectNodesDo::getNodename, nodes.get(0).get("NAMETHREE")));
|
|
|
if(namethree != null && namethree.size()>0){
|
|
|
- if(!namethree.get(0).getItpnodeid().equals(nodes.get(0).get("IDTHREE"))){
|
|
|
+ if(namethree.get(0).getItpnodeid() == null || !namethree.get(0).getItpnodeid().equals(nodes.get(0).get("IDTHREE"))){
|
|
|
ZhcxItpProjectNodesDo node1 = new ZhcxItpProjectNodesDo();
|
|
|
node1.setId(namethree.get(0).getId());
|
|
|
node1.setItpnodeid(nodes.get(0).get("IDTHREE").toString());
|
|
@@ -124,7 +124,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
}
|
|
|
|
|
|
if(nametwo != null && nametwo.size()>0){
|
|
|
- if(!nametwo.get(0).getItpnodeid().equals(nodes.get(0).get("IDTWO"))){
|
|
|
+ if(nametwo.get(0).getItpnodeid() == null || !nametwo.get(0).getItpnodeid().equals(nodes.get(0).get("IDTWO"))){
|
|
|
ZhcxItpProjectNodesDo node2 = new ZhcxItpProjectNodesDo();
|
|
|
node2.setId(nametwo.get(0).getId());
|
|
|
node2.setItpnodeid(nodes.get(0).get("IDTWO").toString());
|
|
@@ -136,7 +136,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
.eq(ZhcxItpProjectNodesDo::getProjectid, projectid).eq(ZhcxItpProjectNodesDo::getNodetype,CxConstants.ITP_NODETYPE_CHECKPOINT)
|
|
|
.eq(ZhcxItpProjectNodesDo::getNodename, nodes.get(0).get("NAMEONE")).eq(ZhcxItpProjectNodesDo::getPid,nametwo.get(0).getId()));
|
|
|
if(nameone != null && nameone.size()>0){
|
|
|
- if(!nameone.get(0).getItpnodeid().equals(nodes.get(0).get("IDONE"))){
|
|
|
+ if(nameone.get(0).getItpnodeid() == null || !nameone.get(0).getItpnodeid().equals(nodes.get(0).get("IDONE"))){
|
|
|
ZhcxItpProjectNodesDo node3 = new ZhcxItpProjectNodesDo();
|
|
|
node3.setId(nameone.get(0).getId());
|
|
|
node3.setItpnodeid(nodes.get(0).get("IDONE").toString());
|
|
@@ -167,7 +167,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
.eq(ZhcxItpProjectNodesDo::getProjectid, projectid).eq(ZhcxItpProjectNodesDo::getNodetype, CxConstants.ITP_NODETYPE_PHASE)
|
|
|
.eq(ZhcxItpProjectNodesDo::getNodename, pidnode.getNodename()));
|
|
|
if(dgjpnode != null && dgjpnode.size()>0){
|
|
|
- if(!dgjpnode.get(0).getItpnodeid().equals(pidnode.getId())){
|
|
|
+ if(dgjpnode.get(0).getItpnodeid() == null || !dgjpnode.get(0).getItpnodeid().equals(pidnode.getId())){
|
|
|
ZhcxItpProjectNodesDo node1 = new ZhcxItpProjectNodesDo();
|
|
|
node1.setId(dgjpnode.get(0).getId());
|
|
|
node1.setItpnodeid(pidnode.getId());
|
|
@@ -181,7 +181,7 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
.eq(ZhcxItpProjectNodesDo::getProjectid, projectid).in(ZhcxItpProjectNodesDo::getNodetype,a1)
|
|
|
.eq(ZhcxItpProjectNodesDo::getNodename, nodess.getNodename()).eq(ZhcxItpProjectNodesDo::getPid,pidnode.getId()));
|
|
|
if(gsnametwo != null && gsnametwo.size()>0){
|
|
|
- if(!gsnametwo.get(0).getItpnodeid().equals(nodess.getId())){
|
|
|
+ if(gsnametwo.get(0).getItpnodeid() == null || !gsnametwo.get(0).getItpnodeid().equals(nodess.getId())){
|
|
|
ZhcxItpProjectNodesDo node2 = new ZhcxItpProjectNodesDo();
|
|
|
node2.setId(gsnametwo.get(0).getId());
|
|
|
node2.setItpnodeid(nodess.getId());
|