Merge branch 'master' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -249,12 +249,13 @@ public class TestController extends WebBaseController {
      * 后台预留批量处理wx_user_id to wx_open_user_id
      *
      * @param corpid
-     * @param suiteId
-     * @param wxEnterpriseId
      * @return
      */
     @RequestMapping("/useridToOpenuserid")
-    public HaobanResponse useridToOpenuserid(String corpid, String suiteId, String wxEnterpriseId) {
+    public HaobanResponse useridToOpenuserid(String corpid) {
+        WxApplicationDTO wxApplicationDTO = wxApplicationApiService.selectByCorpid(corpid);
+        String wxEnterpriseId = wxApplicationDTO.getWxEnterpriseId();
+        String siteId = wxApplicationDTO.getSiteId();
         // 限流器
         RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateWxOpenUserId:limit");
         // 每1秒产生5个令牌
@@ -270,7 +271,7 @@ public class TestController extends WebBaseController {
             }
             pageNum++;
             logger.info("useridToOpenuserid请求：corpid：{}", corpid);
-            List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, suiteId, staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
+            List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, siteId, staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
             if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
                 for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
                     staffApiService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());