|
@@ -608,7 +608,7 @@ func employInfoPerson(v, table, id, employKey, findKey string, source int64, in
|
|
|
}
|
|
|
employId := int64(0)
|
|
|
if employData != nil && len(*employData) > 0 {
|
|
|
- if (subtype == "成交" || subtype == "中标" || subtype == "合同" || subtype == "验收" || subtype == "违规") && in.EmployType == 1 {
|
|
|
+ if (subtype == "成交" || subtype == "中标" || subtype == "合同" || subtype == "验收" || subtype == "违规") && in.EmployType == 1 && version == 1 {
|
|
|
employ2 := false
|
|
|
employ3 := false
|
|
|
employIgnore := false
|
|
@@ -710,7 +710,7 @@ func employInfoEnt(v, table, id, employKey, findKey, depIDArr string, source int
|
|
|
}
|
|
|
employData := &[]map[string]interface{}{}
|
|
|
if in.EmployType == 1 {
|
|
|
- if (subtype == "成交" || subtype == "中标" || subtype == "合同" || subtype == "验收" || subtype == "违规") && in.EmployType == 1 {
|
|
|
+ if (subtype == "成交" || subtype == "中标" || subtype == "合同" || subtype == "验收" || subtype == "违规") && in.EmployType == 1 && version == 1 {
|
|
|
//物业版本查询
|
|
|
employData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select id,is_ignore,status ,type from %s where %s=? and status =1 and source=? and ent_dept_id in (%s) ", table, employKey, depIDArr), sourceId, source)
|
|
|
} else {
|