Răsfoiți Sursa

是否收录查询

WH01243 1 an în urmă
părinte
comite
3433254c1a
3 a modificat fișierele cu 16 adăugiri și 6 ștergeri
  1. 2 2
      api/application.api
  2. 12 2
      api/internal/service/employService.go
  3. 2 2
      api/internal/types/types.go

+ 2 - 2
api/application.api

@@ -66,7 +66,7 @@ type (
 		IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
 		IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
 		EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 		EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 		EntDeptId  int64  `header:"entDeptId,optional"`
 		EntDeptId  int64  `header:"entDeptId,optional"`
-		From       string `json:"form,optional"` //来源
+		From       string `json:"from,optional"` //来源
 	}
 	}
 
 
 	TransferReq {
 	TransferReq {
@@ -103,7 +103,7 @@ type (
 		PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
 		PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
 		AccountId    int64  `header:"accountId,optional"`    //账户id
 		AccountId    int64  `header:"accountId,optional"`    //账户id
 		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
 		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-		From         string `json:"form,optional"`           //来源
+		From         string `json:"from,optional"`           //来源
 	}
 	}
 
 
 	CustomAddReq {
 	CustomAddReq {

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

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

+ 2 - 2
api/internal/types/types.go

@@ -67,7 +67,7 @@ type EmployOperateReq struct {
 	IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
 	IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
 	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 	EntDeptId  int64  `header:"entDeptId,optional"`
 	EntDeptId  int64  `header:"entDeptId,optional"`
-	From       string `json:"form,optional"` //来源
+	From       string `json:"from,optional"` //来源
 }
 }
 
 
 type TransferReq struct {
 type TransferReq struct {
@@ -104,7 +104,7 @@ type InfoEmployinfoReq struct {
 	PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
 	PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
 	AccountId    int64  `header:"accountId,optional"`    //账户id
 	AccountId    int64  `header:"accountId,optional"`    //账户id
 	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
 	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-	From         string `json:"form,optional"`           //来源
+	From         string `json:"from,optional"`           //来源
 }
 }
 
 
 type CustomAddReq struct {
 type CustomAddReq struct {