|
|
@@ -601,7 +601,7 @@ func (n *network) AllProject(in *types.AllprojectReq) (reply *types.Reply) {
|
|
|
MYTYPE: vv.Type,
|
|
|
}
|
|
|
//如果甲方的子节点被选中了，父节点跟着被选中，非甲方的要对比子节点可介绍业主
|
|
|
- if v.Name != "甲方" && in.ClickId != "" && compareId == fmt.Sprint(vv.Id) {
|
|
|
+ if v.Name != "甲方" && ((in.ClickId != "" && in.ClickId == fmt.Sprint(vv.Id)) || (in.CheckCode != "" && compareId == fmt.Sprint(vv.Id))) {
|
|
|
checkCode = append(checkCode, cm.CODE)
|
|
|
}
|
|
|
*convList = append(*convList, cm)
|
|
|
@@ -628,7 +628,7 @@ func (n *network) AllProject(in *types.AllprojectReq) (reply *types.Reply) {
|
|
|
} else {
|
|
|
newCheckCode = checkCode
|
|
|
}
|
|
|
- if len(checkCode) == 0 && len(*parentConvList) > 0 && (*parentConvList)[0].SZ_LEVEL == 0 {
|
|
|
+ if in.CheckCode == "" && in.ClickId == "" && len(checkCode) == 0 && len(*parentConvList) > 0 && (*parentConvList)[0].SZ_LEVEL == 0 {
|
|
|
if (*parentConvList)[0].NAME == "甲方" {
|
|
|
var level1 *nodeTree
|
|
|
var level2 *nodeTree
|
