Merge branch 'fixbug_0719' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -362,7 +362,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         String openUserid = getOpenUserid(userId, corpid);
         if (StringUtils.isNotBlank(openUserid)) {
             staff.setWxOpenUseId(openUserid);
-            String userid = getUserid(openUserid, corpid);
+            String userid = getUserid(openUserid, wxEnterpriseId);
             if (StringUtils.isNotBlank(userid)) {
                 staff.setWxUserId(userid);
             }
@@ -401,12 +401,15 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     /**
      * 获取wxuserid
+     *
      * @param openUserId
-     * @param corpid
-     * @return
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link String }
+     * @author mozhu
+     * @date 2022-07-19 11:19:44
      */
-    private String getUserid(String openUserId, String corpid) {
-        TabHaobanWxApplication tabHaobanWxApplication = wxApplicationService.selectByCorpIdAndApplicationType(corpid,3);
+    private String getUserid(String openUserId, String wxEnterpriseId) {
+        TabHaobanWxApplication tabHaobanWxApplication = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,3);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(tabHaobanWxApplication.getWxEnterpriseId(), 5);
         List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.getSelfOpenuseridToUserid(tabHaobanWxApplication.getCorpid(), secretSetting.getSecretVal(),
                 tabHaobanWxApplication.getAgentId(), Collections.singletonList(openUserId));