WH01243 1 рік тому
батько
коміт
a3cb29a668
1 змінених файлів з 11 додано та 2 видалено
  1. 11 2
      api/internal/service/employService.go

+ 11 - 2
api/internal/service/employService.go

@@ -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 {