xuzhiheng преди 1 година
родител
ревизия
5871ac8339
променени са 1 файла, в които са добавени 24 реда и са изтрити 18 реда
  1. 24 18
      service/clue.go

+ 24 - 18
service/clue.go

@@ -536,32 +536,38 @@ func DrawClues(positionId, count1, count2, count3 int64) int {
 	data1, data2, data3, drawCount := &[]map[string]interface{}{}, &[]map[string]interface{}{}, &[]map[string]interface{}{}, 0
 	if count1 > 0 {
 		data1 = JyBiTidb.SelectBySql(`SELECT * from dwd_f_crm_clue_info where is_assign = 0 and level_open = ? and cluename in (SELECT cluename from dwd_f_crm_clue_info where position_id = ? GROUP BY cluename)`, 1, positionId)
-		if int64(len(*data1)) >= count1 {
-			data11 := (*data1)[0:count1]
-			data1 = &data11
-			count1 = 0
-		} else {
-			count1 = count1 - int64(len(*data1))
+		if data1 != nil && len(*data1) > 0 {
+			if int64(len(*data1)) >= count1 {
+				data11 := (*data1)[0:count1]
+				data1 = &data11
+				count1 = 0
+			} else {
+				count1 = count1 - int64(len(*data1))
+			}
 		}
 	}
 	if count2 > 0 {
 		data2 = JyBiTidb.SelectBySql(`SELECT * from dwd_f_crm_clue_info where is_assign = 0 and level_open = ? and cluename in (SELECT cluename from dwd_f_crm_clue_info where position_id = ? GROUP BY cluename)`, 2, positionId)
-		if int64(len(*data2)) >= count2 {
-			data11 := (*data2)[0:count2]
-			data2 = &data11
-			count2 = 0
-		} else {
-			count2 = count2 - int64(len(*data2))
+		if data2 != nil && len(*data2) > 0 {
+			if int64(len(*data2)) >= count2 {
+				data11 := (*data2)[0:count2]
+				data2 = &data11
+				count2 = 0
+			} else {
+				count2 = count2 - int64(len(*data2))
+			}
 		}
 	}
 	if count3 > 0 {
 		data3 = JyBiTidb.SelectBySql(`SELECT * from dwd_f_crm_clue_info where is_assign = 0 and level_open = ? and cluename in (SELECT cluename from dwd_f_crm_clue_info where position_id = ? GROUP BY cluename)`, 3, positionId)
-		if int64(len(*data3)) >= count3 {
-			data11 := (*data3)[0:count3]
-			data3 = &data11
-			count3 = 0
-		} else {
-			count3 = count3 - int64(len(*data3))
+		if data3 != nil && len(*data3) > 0 {
+			if int64(len(*data3)) >= count3 {
+				data11 := (*data3)[0:count3]
+				data3 = &data11
+				count3 = 0
+			} else {
+				count3 = count3 - int64(len(*data3))
+			}
 		}
 	}
 	//