Merge branch 'dsc' into 'develop'

测试导入

See merge request 8timerv2/8timerapiv200!178

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

@@ -7,7 +7,6 @@
 */
 */
 package cn.timer.api.controller.crm;
 package cn.timer.api.controller.crm;
 
 
-import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
@@ -369,8 +368,10 @@ public class CrmController {
 		if (oldData.getClientStatus() == 5)
 		if (oldData.getClientStatus() == 5)
 			return ResultUtil.error("请解封后继续编辑操作");
 			return ResultUtil.error("请解封后继续编辑操作");
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
-		for (CrmClientContacts crmClientContact : crmClientContacts) {
-			crmClientContact.updateById();
+		if (crmClientContacts != null) {
+			for (CrmClientContacts crmClientContact : crmClientContacts) {
+				crmClientContact.updateById();
+			}
 		}
 		}
 		List<CrmClientAssociate> oldAssociates = CrmClientAssociate.builder().build()
 		List<CrmClientAssociate> oldAssociates = CrmClientAssociate.builder().build()
 				.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, cid));
 				.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, cid));
@@ -483,7 +484,8 @@ public class CrmController {
 		if (type == null || type == 0) { // 全部客户(去重)
 		if (type == null || type == 0) { // 全部客户(去重)
 			List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like);
 			List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like);
 			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
 			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like);
-			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true);
+			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
+					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 		} else if (type == 1) // 我负责的客户
 		} else if (type == 1) // 我负责的客户
 			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like);
 			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like);
 		else if (type == 2) // 我协作的客户
 		else if (type == 2) // 我协作的客户
@@ -930,7 +932,7 @@ public class CrmController {
 			for (Integer memberId : members) {
 			for (Integer memberId : members) {
 				Map<String, Object> map = selectMap(orgCode, memberId, status, startCreateTime, endCreateTime);
 				Map<String, Object> map = selectMap(orgCode, memberId, status, startCreateTime, endCreateTime);
 				if (memberId.equals(12414)) {
 				if (memberId.equals(12414)) {
-					System.err.println("map++"+map);
+					System.err.println("map++" + map);
 				}
 				}
 				if ((Integer) map.get("num") > 0) {
 				if ((Integer) map.get("num") > 0) {
 					list.add(map);
 					list.add(map);
@@ -1049,22 +1051,18 @@ public class CrmController {
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 
 
 		String filePath = null;
 		String filePath = null;
+		String time = null;
 		try {
 		try {
-			File savefile = new File(realPath);
-//			File savefile = new File("excel/");
-			if (!savefile.exists()) {
-				savefile.mkdirs();
-			} 
-			String time = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
+			 time = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
 			filePath = FileHelper.downLoadFromUrl(url, time + ".xls", realPath);
 			filePath = FileHelper.downLoadFromUrl(url, time + ".xls", realPath);
 		} catch (IOException e) {
 		} catch (IOException e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
-		
+		System.err.println();
 		// 从文件中读取Excel为ExcelReader
 		// 从文件中读取Excel为ExcelReader
 		ExcelReader reader;
 		ExcelReader reader;
 		// 从流中读取Excel为ExcelReader（比如从ClassPath中读取Excel文件）
 		// 从流中读取Excel为ExcelReader（比如从ClassPath中读取Excel文件）
-		reader = ExcelUtil.getReader(ResourceUtil.getStream(filePath));
+		reader = ExcelUtil.getReader(ResourceUtil.getStream("crm-excel/"+time+".xls"));
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("行业", "industryName");
 		reader.addHeaderAlias("行业", "industryName");