Merge branch 'dev_v1.5.34_wh' of jianyu/datatools into feature/v1.5.34

clueSync/jobutil.go

@@ -340,13 +340,9 @@ func FindNumber(moudle string) string {
 }
 
 // 人员查询
-<<<<<<< HEAD
-func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}, creatorTime string) map[string]interface{} {
 
-=======
 func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}) map[string]interface{} {
 	log.Println("分配比例查询", cfg.AllocationTime, cfg.AllocationRatio, proportion1, proportion3, deptCount1, deptCount3)
->>>>>>> master
 	if deptCount1 == 0 {
 		return administrators1
 	}

clueSync/kc.go

@@ -355,7 +355,7 @@ func kcJob(data map[string]interface{}) int {
 }
 
 func cAutoDraw(entId int, orderPositionId int64, salesperson, saleDep string, isExist bool, csmdata *map[string]interface{}) (positionId int64, name string) {
-	query := `SELECT name,position_id FROM dwd_d_crm_department_level_succbi WHERE bi_pcode = (SELECT bi_code FROM dwd_d_crm_department_level_succbi WHERE name = "客户成功部" and resign=0 and  ent_id=?) and resign = 0 `
+	query := `SELECT name,position_id FROM dwd_d_crm_department_level_succbi WHERE bi_pcode = (SELECT bi_code FROM dwd_d_crm_department_level_succbi WHERE name = "客户成功部" and resign=0 and  ent_id=?) and resign = 0 and   position_id   is  not  null `
 	data := TiDb.SelectBySql(query, db.EntId)
 	if data == nil || len(*data) == 0 {
 		return