Merge branch 'dev_v1.0.1.1_wh' of CRM/application into hotfix/v1.0.1.1

api/internal/service/employService.go

@@ -669,19 +669,19 @@ func employInfoPerson(table, employKey, findKey string, in *types.InfoEmployinfo
 	wuyeData1 := &[]map[string]interface{}{}
 	wuyeData2 := &[]map[string]interface{}{}
 	if len(infoId1Arr) > 0 {
-		infoData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", table, employKey, strings.Join(infoId1Arr, "','"), employKey), in.PositionId, 1)
+		infoData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select   %s, is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", employKey, table, employKey, strings.Join(infoId1Arr, "','"), employKey), in.PositionId)
 	}
 	if len(infoId2Arr) > 0 {
-		infoData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  is_ignore,status,id,type from  %s   where position_id =? and  %s in '%s')    GROUP BY %s ", table, employKey, strings.Join(infoId2Arr, "','"), employKey), in.PositionId, 1)
+		infoData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  %s,  is_ignore,status,id,type from  %s   where position_id =? and  %s in '%s')    GROUP BY %s ", employKey, table, employKey, strings.Join(infoId2Arr, "','"), employKey), in.PositionId)
 	}
 	if len(niJianIdArr) > 0 {
-		niJianData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", table, employKey, strings.Join(niJianIdArr, "','"), employKey), in.PositionId, 1)
+		niJianData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s,   is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", employKey, table, employKey, strings.Join(niJianIdArr, "','"), employKey), in.PositionId)
 	}
 	if len(wuye1Arr) > 0 {
-		wuyeData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')  GROUP BY %s ", table, employKey, strings.Join(wuye1Arr, "','"), employKey), in.PositionId, 1)
+		wuyeData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  %s,  is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')  GROUP BY %s ", employKey, table, employKey, strings.Join(wuye1Arr, "','"), employKey), in.PositionId)
 	}
 	if len(wuye2Arr) > 0 {
-		wuyeData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select  is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", table, employKey, strings.Join(wuye2Arr, "','"), employKey), in.PositionId, 1)
+		wuyeData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select   %s, is_ignore,status,id,type from  %s   where position_id =? and  %s in ('%s')    GROUP BY %s ", employKey, table, employKey, strings.Join(wuye2Arr, "','"), employKey), in.PositionId)
 	}
 	for _, v := range *infoData1 {
 		valueMap := map[string]interface{}{