From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候,对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访,这个是给市一使用的                                                                                                                                                                                            首次待随访待发送(visitCount = 1 && sendstate in (1、2))                                                                                                                                                                                            再次待随访待发送(visitCount > 1 && sendstate in (1、2))                                                                                                                                                                                            首次待随访已发送(visitCount = 1 && sendstate = in (3、7))                                                                                                                                                                                            再次待随访已发送(visitCount > 1 && sendstate = in (3、7))                                                                                                                                                                                            首次已发送(visitCount = 1 && sendstate = 3)                                                                                                                                                                                            再次已发送(visitCount > 1 && sendstate = 3)

---
 smartor/src/main/java/com/smartor/service/impl/DingTalkServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/DingTalkServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/DingTalkServiceImpl.java
index 35761ab..95c8fbe 100644
--- a/smartor/src/main/java/com/smartor/service/impl/DingTalkServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/DingTalkServiceImpl.java
@@ -21,6 +21,7 @@
 import com.smartor.service.DingTalkService;
 import com.taobao.api.ApiException;
 import lombok.extern.log4j.Log4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -258,12 +259,19 @@
      */
     @Override
     public String getDingTalkUserByMobile(String mobile) throws Exception {
+        String userId = "";
         String accessToken = getAccessToken();
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
         OapiV2UserGetbymobileRequest req = new OapiV2UserGetbymobileRequest();
         req.setMobile(mobile);
         OapiV2UserGetbymobileResponse rsp = client.execute(req, accessToken);
-        return rsp.getBody();
+        String resultBody = rsp.getBody();
+        JSONObject json = JSONObject.parseObject(resultBody);
+        if(ObjectUtils.isNotEmpty(json.getJSONObject("result"))
+            && ObjectUtils.isNotEmpty(json.getJSONObject("result").getString("userid"))){
+            userId = json.getJSONObject("result").getString("userid");
+        }
+        return userId;
     }
 
 }

--
Gitblit v1.9.3