修改动态任务没有获取组id

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

@@ -171,4 +171,11 @@ public interface OrganizeService {
      * @return
      */
     Map<String, Object>  selectAllOrganizeUser();
+
+    /**
+     * 根据用户id查询组信息
+     * @param userId
+     * @return
+     */
+    Organize getOrganizeByUserId(Long userId);
 }

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

@@ -589,6 +589,7 @@ public class OrganizeServiceImpl implements OrganizeService {
 
     /**
      * 查询呼叫方式和分机号
+     *
      * @return
      */
     @Override
@@ -641,6 +642,11 @@ public class OrganizeServiceImpl implements OrganizeService {
         return returnMap;
     }
 
+    @Override
+    public Organize getOrganizeByUserId(Long userId) {
+        return organizeRepository.findOrganize(userId);
+    }
+
     /**
      * 小组id查询组员用户信息
      */
@@ -680,6 +686,7 @@ public class OrganizeServiceImpl implements OrganizeService {
 
     /**
      * 查询所有分配到组的用户
+     *
      * @return
      */
     public Set<Long> findOrganizeUserIds() {
@@ -691,6 +698,7 @@ public class OrganizeServiceImpl implements OrganizeService {
 
     /**
      * 封装返回用户id
+     *
      * @param userIdList
      * @return
      */

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java

@@ -54,7 +54,14 @@ public class TelephoneCallController {
         }
         Long companyId = SecurityUtils.getCompanyId();
         if (companyId != null && telephoneCallReqDTO.getTeamId() != null) {
-            Organize organize = organizeService.findByOrganizeId(telephoneCallReqDTO.getTeamId());
+            Organize organize;
+            if (telephoneCallReqDTO.getTeamId() == null) {
+                organize = organizeService.getOrganizeByUserId(telephoneCallReqDTO.getMemberId());
+                telephoneCallReqDTO.setTeamId(organize.getId());
+            } else {
+                organize = organizeService.findByOrganizeId(telephoneCallReqDTO.getTeamId());
+            }
+
             Company byId = companyService.findById(SecurityUtils.getCompanyId());
             if (organize != null && byId != null) {
                 if (organize.getCallMode() != null) {

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java

@@ -36,7 +36,6 @@ public class TelephoneCallReqDTO implements Serializable {
     private String userData;
 
     @ApiModelProperty("小组id")
-    @NotNull
     private Long teamId;
 
     @ApiModelProperty("成员id")

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/DoubleCallReq.java

@@ -55,7 +55,7 @@ public class DoubleCallReq {
         while (count <= flag) {
             try {
                 HttpResponse httpResponse = sendCallReq(JSONUtil.toJsonPrettyStr(doubleCallSystemDTO), reqUrl);
-                log.info("双呼返回值：{}", httpResponse);
+                log.info("双呼返回值：{}", httpResponse.body());
                 DoubleCallResponse doubleCallResponse = JSONUtil.toBean(httpResponse.body(), DoubleCallResponse.class);
                 if (String.valueOf(DefaultNumberConstants.ZERO_NUMBER).equals(doubleCallResponse.getResult())) {
                     return doubleCallResponse.getSessionId();