Merge remote-tracking branch 'origin/master'

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -518,7 +518,13 @@ public class RiskServiceImpl implements RiskService {
         List<YtDyzUser> data = new ArrayList<>();
         List<String> collect = issuedAppList.stream().map(YtPlatformUserApp::getServiceName).distinct().collect(Collectors.toList());
         for (String serviceName : collect) {
-            Object o = feignInvoker.invoke(serviceName, "getUserList", appUserParam);
+            Object o;
+            try {
+                o = feignInvoker.invoke(serviceName, "getUserList", appUserParam);
+            }catch (Exception e){
+                log.error("{}服务调用失败: {}", serviceName, e.getMessage());
+                continue;
+            }
             String jsonString = JSON.toJSONString(o);
             JSONObject object = JSONObject.parseObject(jsonString);
             List<YtDyzUser> dyzUsers = JSONArray.parseArray(object.getString("data"), YtDyzUser.class);

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -88,7 +88,7 @@
         select
            app_id, app_name, user_id, app_type, detail_url, package_name, domain, issued_time, wx_app_id, feign_class_path, service_name
         from yt_platform_user_app
-        where user_id = #{userId}
+        where available = 1 and user_id = #{userId}
     </select>
     <select id="getApkIdList" resultType="java.lang.String">
         select