|
@@ -639,7 +639,11 @@ func employInfoPerson(v, table, id, employKey, findKey string, source int64, in
|
|
|
employId = common.Int64All(v1["id"])
|
|
|
}
|
|
|
valueMap["isIgnore"] = employIgnore
|
|
|
- valueMap["isEmploy"] = common.If(employ2 && employ3, true, false)
|
|
|
+ if in.From == "jhfp" {
|
|
|
+ valueMap["isEmploy"] = employ3
|
|
|
+ } else {
|
|
|
+ valueMap["isEmploy"] = common.If(employ2 && employ3, true, false)
|
|
|
+ }
|
|
|
valueMap["type"] = employType
|
|
|
valueMap["employId"] = employId
|
|
|
} else {
|
|
@@ -749,7 +753,12 @@ func employInfoEnt(v, table, id, employKey, findKey, depIDArr string, source int
|
|
|
employId = common.Int64All(v1["id"])
|
|
|
}
|
|
|
valueMap["isIgnore"] = employIgnore
|
|
|
- valueMap["isEmploy"] = common.If(employ2 && employ3, true, false)
|
|
|
+ if in.From == "jhfp" {
|
|
|
+ valueMap["isEmploy"] = employ3
|
|
|
+ } else {
|
|
|
+ valueMap["isEmploy"] = common.If(employ2 && employ3, true, false)
|
|
|
+ }
|
|
|
+
|
|
|
valueMap["type"] = employType
|
|
|
valueMap["employId"] = employId
|
|
|
} else {
|