代码提交

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -18,7 +18,6 @@ import com.baiye.modules.system.service.dto.*;
 import com.baiye.modules.system.service.mapstruct.OrganizeMapper;
 import com.baiye.modules.system.service.mapstruct.OrganizeUserMapper;
 import com.baiye.modules.system.service.mapstruct.TaskOrganizeMapper;
-import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import com.baiye.util.*;
 import com.google.common.collect.Lists;
@@ -152,6 +151,9 @@ public class OrganizeServiceImpl implements OrganizeService {
         // 组长添加组员，查询组长的组信息
         Long currentUserId = SecurityUtils.getCurrentUserId();
         OrganizeUser organizeUserByUserId = organizeUserRepository.findByUserId(currentUserId);
+        if (organizeUserByUserId == null){
+            throw new BadRequestException("用户未分配到组,请创建小组");
+        }
         Long organizeId = organizeUserByUserId.getOrganizeId();
         Organize organize = organizeRepository.findById(organizeId).orElseGet(Organize::new);
         //  添加组长下的组员信息

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.http.CommonResponse;
+import com.baiye.modules.system.domain.User;
+import com.baiye.modules.system.repository.UserRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionNumberRepository;
 import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
@@ -11,6 +13,7 @@ import com.baiye.modules.telemarkting.entity.ExtensionUser;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import com.baiye.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,6 +33,8 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     private ExtensionNumberRepository extensionNumberRepository;
     @Resource
     private ExtensionUserRepository extensionUserRepository;
+    @Resource
+    private UserRepository userRepository;
 
     @Override
     public void addNumbers(Integer minNumber, Integer maxNumber, Long display, Long companyId) {
@@ -49,8 +54,9 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
         //查询组
         Integer numberByMemberId = extensionUserRepository.findNumberByMemberId(memberId);
         if (numberByMemberId != null) {
+            User user = userRepository.findById(memberId).orElseGet(User::new);
             log.info("用户 ：{}，已经分配分机号", memberId);
-            throw new BadRequestException("用户已经分配分机号,用户id：" + memberId);
+            throw new BadRequestException("用户已经分配分机号,用户id：" + user.getNickName());
         }
         //所属公司
         Long companyId = SecurityUtils.getCompanyId();
@@ -68,8 +74,9 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
             extensionUserRepository.save(extensionUser);
             extensionNumberRepository.updateStatusById(DefaultNumberConstants.ONE_NUMBER, idByStatus);
         } catch (Exception e) {
+            User user = userRepository.findById(memberId).orElseGet(User::new);
             log.error("分机号分配失败 memberId：{}", memberId);
-            throw new BadRequestException("分机号分配失败,用户id为：" + memberId);
+            throw new BadRequestException("分机号分配失败,用户id为：" + user.getNickName());
         }
         return CommonResponse.createBySuccess();
     }

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/UploadFileServiceImpl.java

@@ -14,7 +14,6 @@ import com.baiye.http.CommonResponse;
 import com.baiye.http.ResponseCode;
 import com.baiye.module.dao.ClueRecordRepository;
 import com.baiye.module.entity.ClueRecord;
-import com.baiye.module.entity.vo.BaseExcelVo;
 import com.baiye.module.service.ClueService;
 import com.baiye.module.service.UploadFileService;
 import com.baiye.task.FileAnalysisTask;
@@ -23,7 +22,6 @@ import com.baiye.util.FileZipUtil;
 import com.baiye.util.TestingUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -49,8 +47,6 @@ public class UploadFileServiceImpl implements UploadFileService {
     private FileAnalysisTask fileAnalysisTask;
     @Resource
     private ClueRecordRepository clueRecordRepository;
-    @Resource
-    private ClueService clueService;
 
     @Value(value = "${storage.url}")
     private String URL;
@@ -169,7 +165,7 @@ public class UploadFileServiceImpl implements UploadFileService {
                 rowCount = readerSheet.getRowCount() - FileConstant.ONE_NUMBER + rowCount;
             }
         }
-        if (rowCount <= FileConstant.ONE_NUMBER) {
+        if (rowCount < FileConstant.ONE_NUMBER) {
             throw new BadRequestException("文件没有内容，无法生成任务");
         }
         if (rowCount > FileConstant.ONE_MILLION_NUMBER) {