From a5a8152368a8e4a8ebcebe8d9ad5416a13708334 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 26 May 2020 17:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=20-=20=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AB=AFopenId=20=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/feign/UserRelationFeignClient.java     |  5 +++++
 .../esua/epdc/service/impl/SysUserServiceImpl.java   | 12 +++++++++---
 .../src/main/resources/mapper/SysUserDao.xml         |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java
index 645f76402..6353db6e2 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java
@@ -1,6 +1,10 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback;
+import com.elink.esua.epdc.feign.fallback.UserRelationClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
@@ -12,6 +16,7 @@ import java.util.List;
 * @Author: wk
 * @Date: 2020/5/26
 */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = UserRelationClientFallback.class)
 public interface UserRelationFeignClient {
     /**
     * @Description: 调用数据分析 - 书记在线的用户名单
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
index 4eb918e7c..26638e702 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
@@ -43,9 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 用户管理
@@ -323,6 +321,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         if (null == userIds|| userIds.size()==0) {
             return new Result().error("获取数据失败，请稍后再试");
         }
+//        List<String>  userIds = new ArrayList<>();
+//        userIds.add("1");
+//        userIds.add("1191537649498046465");
+//        userIds.add("1191991750497230850");
+//        userIds.add("1202853184647028738");
+//        userIds.add("1202861918488190977");
+//        userIds.add("1202868487573561345");
+//        userIds.add("1202886792501878786");
         //2.获得两项openId
        List<String> workOpenIds  = baseDao.selectListOpenIds(userIds,"1");
         openIdDto.setWorkOpenIds(workOpenIds);
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
index 1d9b6a314..762fcf4ed 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
@@ -161,10 +161,10 @@
     </select>
     <select id="selectListOpenIds" resultType="java.lang.String">
         SELECT
-           <if test="type=='1'">
+           <if test='type=="1"'>
                work_open_id
            </if>
-           <if test="type== '2'">
+           <if test='type== "2"'>
                analysis_open_id
            </if>
         FROM