Merge remote-tracking branch 'origin/master'

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

@@ -73,6 +73,7 @@ public class CompanyServiceImpl implements CompanyService {
         BeanUtil.copyProperties(companyDto, byUserId);
         byUserId.setApplicationTime(DateUtil.date());
         byUserId.setCompanyCode(byUserId.getCompanyName().trim());
+        byUserId.setSonUserNum(100);
         userRepository.updateStatusById(Boolean.FALSE, SecurityUtils.getCurrentUserId());
         return companyMapper.toDto(companyRepository.save(byUserId));
     }
@@ -105,7 +106,7 @@ public class CompanyServiceImpl implements CompanyService {
     public CompanyDto createCompany(CompanyDto companyDto) {
         Company company = new Company();
         BeanUtil.copyProperties(companyDto, company);
-        company.setSonUserNum((int) DefaultNumberConstants.ONE_HUNDRED);
+        company.setSonUserNum(100);
         return companyMapper.toDto(companyRepository.save(company));
     }
 

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

@@ -163,8 +163,9 @@ public class LabelOrganizeServiceImpl implements LabelOrganizeService {
 
         Label label1 = new Label();
         label1.setLabelName("女");
-        label.setUserId(userId);
-        label.setLabelOrganizeId(saveLabelOrganizeId);
+        label1.setUserId(userId);
+        label1.setLabelOrganizeId(saveLabelOrganizeId);
+
         labelList.add(label);
         labelList.add(label1);
         labelRepository.saveAll(labelList);

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

@@ -221,7 +221,7 @@ public class UserServiceImpl implements UserService {
         if (flag) {
             //todo  新建标签组
             Long labelOrganizeId = labelOrganizeService.saveDefault(userCreateResult.getId());
-            if (userDTO.getCompanyType() == 1) {
+            if (userDTO.getCompanyType() != null && userDTO.getCompanyType() == 1) {
                 //抖音（飞鱼）
                 createTask(userCreateResult.getId(), "抖音任务", DefaultNumberConstants.THREE_NUMBER, labelOrganizeId);
             }

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java

@@ -493,7 +493,13 @@ public class ClueJpa {
         Integer clueStage = clueQueryCriteria.getClueStage();
         List<Timestamp> createTimeList = clueQueryCriteria.getCreateTime();
         Integer clueType = clueQueryCriteria.getClueType();
-        StringBuilder sql = new StringBuilder("select count(*) as countNum from tb_clue as c LEFT JOIN tb_clue_middle as cm on c.id = cm.clue_id where 1=1  ");
+        StringBuilder sql = new StringBuilder();
+        if (clueType == null) {
+            sql.append("select count(*) as countNum from tb_clue as c LEFT JOIN tb_clue_middle as cm on c.id = cm.clue_id where 1=1 ");
+        } else {
+            sql.append("select count(*) as countNum from tb_clue as c LEFT JOIN tb_clue_talk as cm on c.id = cm.clue_id where 1=1 ");
+        }
+
         if (CollUtil.isNotEmpty(taskIds)) {
             sql.append("AND cm.task_id IN (:taskId) ");
             Integer memberStatus = clueQueryCriteria.getMemberStatus();