|
@@ -613,10 +613,15 @@ func employInfoPerson(v, table, id, employKey, findKey string, source int64, in
|
|
employ3 := false
|
|
employ3 := false
|
|
employIgnore := false
|
|
employIgnore := false
|
|
employType := int64(0)
|
|
employType := int64(0)
|
|
|
|
+ is_ignore := int64(0)
|
|
for _, v1 := range *employData {
|
|
for _, v1 := range *employData {
|
|
employType := common.Int64All(v1["type"])
|
|
employType := common.Int64All(v1["type"])
|
|
employStatus := common.Int64All(v1["status"])
|
|
employStatus := common.Int64All(v1["status"])
|
|
- is_ignore := common.Int64All(v1["is_ignore"])
|
|
|
|
|
|
+ if in.From == "jhfp" && employType == 3 {
|
|
|
|
+ is_ignore = common.Int64All(v1["is_ignore"])
|
|
|
|
+ } else {
|
|
|
|
+ is_ignore = common.Int64All(v1["is_ignore"])
|
|
|
|
+ }
|
|
switch employType {
|
|
switch employType {
|
|
case 2:
|
|
case 2:
|
|
if employStatus == 1 {
|
|
if employStatus == 1 {
|
|
@@ -718,10 +723,15 @@ func employInfoEnt(v, table, id, employKey, findKey, depIDArr string, source int
|
|
employIgnore := false
|
|
employIgnore := false
|
|
employType := int64(0)
|
|
employType := int64(0)
|
|
employId := int64(0)
|
|
employId := int64(0)
|
|
|
|
+ is_ignore := int64(0)
|
|
for _, v1 := range *employData {
|
|
for _, v1 := range *employData {
|
|
employType := common.Int64All(v1["type"])
|
|
employType := common.Int64All(v1["type"])
|
|
employStatus := common.Int64All(v1["status"])
|
|
employStatus := common.Int64All(v1["status"])
|
|
- is_ignore := common.Int64All(v1["is_ignore"])
|
|
|
|
|
|
+ if in.From == "jhfp" && employType == 3 {
|
|
|
|
+ is_ignore = common.Int64All(v1["is_ignore"])
|
|
|
|
+ } else {
|
|
|
|
+ is_ignore = common.Int64All(v1["is_ignore"])
|
|
|
|
+ }
|
|
switch employType {
|
|
switch employType {
|
|
case 2:
|
|
case 2:
|
|
if employStatus == 1 {
|
|
if employStatus == 1 {
|