Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java

@@ -52,7 +52,7 @@ public class CustomListener extends AnalysisEventListener<Map<Integer, String>>
 		customDTO.setCreateBy(clueRecordEntity.getCreateBy());
 		customDTO.setChannelType(2);
 		customDTO.setChannelName(readFileDTO.getChannelName());
-		customService.add(customDTO);
+		customService.createByFileType(customDTO);
 		index = (index < userIdList.size() - 1) ? index + 1 : 0;
 	}
 

admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java

@@ -66,6 +66,13 @@ public interface CustomService extends ExtendService<CustomEntity> {
 	 */
 	Boolean createByType(CreateCustomDTO createCustomDTO);
 
+	/**
+	 * 文件批量-类型创建客户
+	 * @param customDTO
+	 * @return
+	 */
+	Boolean createByFileType(CustomDTO customDTO);
+
 	/**
 	 * 创建资源
 	 * @param dtoList

admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java

@@ -253,6 +253,13 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 
 	}
 
+	@Override
+	public Boolean createByFileType(CustomDTO customDTO) {
+		User user = SecurityUtils.getUser();
+		CustomEntity customEntity = getCustomEntity(CustomConverter.INSTANCE.dtoToPo(customDTO), user.getWhichUserId(), user.getUsername());
+		return SqlHelper.retBool(baseMapper.insert(customEntity));
+	}
+
 	@Override
 	public Boolean createByCallBack(List<CallbackCustomDTO> dtoList) {
 		ArrayList<CustomEntity> customEntities = Lists.newArrayList();