|
|
@@ -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 %s, is_ignore,status,id,type from %s where position_id =? and %s in ('%s') GROUP BY %s ,type ", employKey, table, employKey, strings.Join(infoId1Arr, "','"), employKey), in.PositionId)
|
|
|
+ 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 ,type order by type", employKey, table, employKey, strings.Join(infoId1Arr, "','"), employKey), in.PositionId)
|
|
|
}
|
|
|
if len(infoId2Arr) > 0 {
|
|
|
- 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 ,type ", employKey, table, employKey, strings.Join(infoId2Arr, "','"), employKey), in.PositionId)
|
|
|
+ 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 ,type order by type ", employKey, table, employKey, strings.Join(infoId2Arr, "','"), employKey), in.PositionId)
|
|
|
}
|
|
|
if len(niJianIdArr) > 0 {
|
|
|
- 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 ,type", employKey, table, employKey, strings.Join(niJianIdArr, "','"), employKey), in.PositionId)
|
|
|
+ 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 ,type order by type", employKey, table, employKey, strings.Join(niJianIdArr, "','"), employKey), in.PositionId)
|
|
|
}
|
|
|
if len(wuye1Arr) > 0 {
|
|
|
- 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 ,type", employKey, table, employKey, strings.Join(wuye1Arr, "','"), employKey), in.PositionId)
|
|
|
+ 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 ,type order by type", employKey, table, employKey, strings.Join(wuye1Arr, "','"), employKey), in.PositionId)
|
|
|
}
|
|
|
if len(wuye2Arr) > 0 {
|
|
|
- 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 ,type ", employKey, table, employKey, strings.Join(wuye2Arr, "','"), employKey), in.PositionId)
|
|
|
+ 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 ,type order by type ", employKey, table, employKey, strings.Join(wuye2Arr, "','"), employKey), in.PositionId)
|
|
|
}
|
|
|
for _, v := range *infoData1 {
|
|
|
valueMap := map[string]interface{}{
|
|
|
@@ -789,19 +789,19 @@ func employInfoEnt(table, employKey, findKey, depIDArr string, in *types.InfoEmp
|
|
|
wuyeData1 := &[]map[string]interface{}{}
|
|
|
wuyeData2 := &[]map[string]interface{}{}
|
|
|
if len(infoId1Arr) > 0 {
|
|
|
- infoData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s,GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type", employKey, table, employKey, strings.Join(infoId1Arr, "','"), depIDArr, employKey), 1)
|
|
|
+ infoData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s,GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type order by type", employKey, table, employKey, strings.Join(infoId1Arr, "','"), depIDArr, employKey), 1)
|
|
|
}
|
|
|
if len(infoId2Arr) > 0 {
|
|
|
- infoData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type", employKey, table, employKey, strings.Join(infoId2Arr, "','"), depIDArr, employKey), 2)
|
|
|
+ infoData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type order by type", employKey, table, employKey, strings.Join(infoId2Arr, "','"), depIDArr, employKey), 2)
|
|
|
}
|
|
|
if len(niJianIdArr) > 0 {
|
|
|
- niJianData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type", employKey, table, employKey, strings.Join(niJianIdArr, "','"), depIDArr, employKey), 2)
|
|
|
+ niJianData = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, GROUP_CONCAT(id) as employIdArr,MAX(is_ignore) as is_ignore,MAX(status) as status from %s where %s in ('%s') and source=? and ent_dept_id in (%s) GROUP BY %s ,type order by type", employKey, table, employKey, strings.Join(niJianIdArr, "','"), depIDArr, employKey), 2)
|
|
|
}
|
|
|
if len(wuye1Arr) > 0 {
|
|
|
- wuyeData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, id,is_ignore,status ,type from %s where %s in ('%s') and status =1 and source=? and ent_dept_id in (%s) GROUP BY %s ,type", employKey, table, employKey, strings.Join(wuye1Arr, "','"), depIDArr, employKey), 1)
|
|
|
+ wuyeData1 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s, id,is_ignore,status ,type from %s where %s in ('%s') and status =1 and source=? and ent_dept_id in (%s) GROUP BY %s ,type order by type", employKey, table, employKey, strings.Join(wuye1Arr, "','"), depIDArr, employKey), 1)
|
|
|
}
|
|
|
if len(wuye2Arr) > 0 {
|
|
|
- wuyeData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s id,is_ignore,status ,type from %s where %s in ('%s') and status =1 and source=? and ent_dept_id in (%s) GROUP BY %s ,type", employKey, table, employKey, strings.Join(wuye2Arr, "','"), depIDArr, employKey), 2)
|
|
|
+ wuyeData2 = MC.CrmMysql.SelectBySql(fmt.Sprintf("select %s id,is_ignore,status ,type from %s where %s in ('%s') and status =1 and source=? and ent_dept_id in (%s) GROUP BY %s ,type order by type", employKey, table, employKey, strings.Join(wuye2Arr, "','"), depIDArr, employKey), 2)
|
|
|
}
|
|
|
for _, v := range *infoData1 {
|
|
|
valueMap := map[string]interface{}{
|
