【pc端 - 书记在线 】-【通知推送修改】-（魏凯）-2020/05/29

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -43,7 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -349,21 +348,12 @@ 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  = new ArrayList<>();
-//                baseDao.selectListOpenIds(userIds,"1");
-        workOpenIds.add("oZCeb5TZc2oBwT4jHb0kDmQsN0Xw");
+        List<String> workOpenIds  = baseDao.selectListOpenIds(userIds,"1");
+//        workOpenIds.add("oZCeb5TZc2oBwT4jHb0kDmQsN0Xw");
         openIdDto.setWorkOpenIds(workOpenIds);
         List<String> AnalysisOpenIds  = baseDao.selectListOpenIds(userIds,"2");
-        openIdDto.setAnalyOpenIds(workOpenIds);
+        openIdDto.setAnalyOpenIds(AnalysisOpenIds);
         return  new Result<UserWorkAndAnalyOpenIdDTO>().ok(openIdDto);
     }