Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!167

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -8,8 +8,6 @@
 package cn.timer.api.controller.crm;
 package cn.timer.api.controller.crm;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -269,7 +267,7 @@ public class CrmController {
 //		return ResultUtil.datas(ygglMainEmps2,ygglMainEmps, "获取成功");
 //		return ResultUtil.datas(ygglMainEmps2,ygglMainEmps, "获取成功");
 //	}
 //	}
 
 
-//	@GetMapping("getBusinessGroupRules") // TODO 扫描规则进行回收操作
+//	@GetMapping("getBusinessGroupRules") 
 //	@ApiOperation(value = "获取业务组公海规则", httpMethod = "GET", notes = "接口发布说明")
 //	@ApiOperation(value = "获取业务组公海规则", httpMethod = "GET", notes = "接口发布说明")
 //	public Result<Object> getBusinessGroupRules(@RequestParam Integer gid) {
 //	public Result<Object> getBusinessGroupRules(@RequestParam Integer gid) {
 //		List<CrmSeaRule> crmSeaRules = CrmSeaRule.builder().build()
 //		List<CrmSeaRule> crmSeaRules = CrmSeaRule.builder().build()
@@ -477,7 +475,8 @@ public class CrmController {
 			crmClientDatas = getCilentFollowOvertime(empNum, orgCode, groupId, status);
 			crmClientDatas = getCilentFollowOvertime(empNum, orgCode, groupId, status);
 		else
 		else
 			return ResultUtil.error("查询失败");
 			return ResultUtil.error("查询失败");
-		Collections.sort(crmClientDatas, Comparator.comparing(CrmClientData::getCreateTime).reversed()); // 按时间降序排序
+		// TODO 排序
+//		Collections.sort(crmClientDatas, Comparator.comparing(CrmClientData::getCreateTime).reversed()); // 按时间降序排序
 		return ResultUtil.data(crmClientDatas, "查询成功");
 		return ResultUtil.data(crmClientDatas, "查询成功");
 	}
 	}