mysql查询修改

api/internal/service/employService.go

@@ -63,14 +63,15 @@ func (e *EmPloyService) InfoEmployinfo(in *types.InfoEmployinfoReq) ([]map[strin
 		batchEmploy = gconv.Int64((*configData)["batch_employ"])
 	}
 	//版本查询
-	res := MC.Middleground.ResourceCenter.Haspowers(in.AccountId, in.EntAccountId, in.EntId, in.EntUserId)
+	/*res := MC.Middleground.ResourceCenter.Haspowers(in.AccountId, in.EntAccountId, in.EntId, in.EntUserId)
 	version := 0
 	for _, pCode := range res.Powers {
 		//0：通用版 1：物业专版
 		if pCode == "bi_yx_wyzb" {
 			version = 1
 		}
-	}
+	}*/
+	version := 1
 	infoId1Arr := []string{}
 	niJianIdArr := []string{}
 	infoId2Arr := []string{}
@@ -694,7 +695,12 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *infoData2 {
 		valueMap := map[string]interface{}{
@@ -707,7 +713,13 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *niJianData {
 		valueMap := map[string]interface{}{
@@ -720,7 +732,13 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *wuyeData1 {
 		valueMap := map[string]interface{}{
@@ -733,7 +751,13 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *wuyeData2 {
 		valueMap := map[string]interface{}{
@@ -746,7 +770,13 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	return data
 }
@@ -785,7 +815,13 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *infoData2 {
 		valueMap := map[string]interface{}{
@@ -798,7 +834,13 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 0, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *niJianData {
 		valueMap := map[string]interface{}{
@@ -811,7 +853,13 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, version, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, version, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, version, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *wuyeData1 {
 		valueMap := map[string]interface{}{
@@ -824,7 +872,13 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	for _, v := range *wuyeData2 {
 		valueMap := map[string]interface{}{
@@ -837,7 +891,13 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
 			"type":        1,
 		}
 		sourceId := gconv.String(v[employKey])
-		data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+		if _, ok := data[sourceId]; ok {
+			data[sourceId] = EmployHandle(data[sourceId], v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		} else {
+			data[sourceId] = EmployHandle(valueMap, v, 1, in.From, len(strings.Split(in.IdArr, ",")) == 1, findKey, in.PositionId, in.PositionType, in.EmployType)
+
+		}
 	}
 	return data
 }
@@ -854,7 +914,7 @@ func EmployHandle(valueMap map[string]interface{}, employData map[string]interfa
 		is_ignore = common.Int64All(employData["is_ignore"])
 		switch employType {
 		case 2:
-			if valueMap["employ3"] != nil {
+			if valueMap["employ23"] != nil {
 				employ3 = gconv.Bool(valueMap["employ3"])
 			}
 			if employStatus == 1 {
@@ -862,7 +922,7 @@ func EmployHandle(valueMap map[string]interface{}, employData map[string]interfa
 			}
 		case 3:
 			if valueMap["employ2"] != nil {
-				employ3 = gconv.Bool(valueMap["employ2"])
+				employ2 = gconv.Bool(valueMap["employ2"])
 			}
 			if employStatus == 1 {
 				employ3 = true