Merge remote-tracking branch 'origin/developer' into developer

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

@@ -298,8 +298,8 @@ public class StaffApiServiceImpl implements StaffApiService {
         if(qwDTO.getWxSecurityType()==4) {
             list = qywxUserApiService.useridToOpenuserid(qwDTO.getThirdCorpid(), config.getWxSuiteid(), Collections.singletonList(userId));
         }else {
-            TabHaobanWxApplication app = wxApplicationService.selectByCorpId(corpid);
-            list = qywxUserApiService.useridToOpenuserid(qwDTO.getDkCorpid(), app.getSiteId() , Collections.singletonList(userId));
+            SecretSettingDTO set = this.secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(),  SecretTypeEnum.CUSTOMIZED_APP.getVal()) ;
+            list = qywxUserApiService.getSelfUseridToOpenuserid(qwDTO.getDkCorpid(), set.getSecretVal() , Collections.singletonList(userId));
         }
         logger.info("明文userId转密文={},{}",userId , JSON.toJSONString(list));
         if (CollectionUtils.isEmpty(list)) {

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

@@ -377,7 +377,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
         MemberLoginQo user = new MemberLoginQo();
         if (StringUtils.isBlank(qo.getUserId())) {
-            user = getUserByCode(wxEnterpriseId , qwDTO.getThirdCorpid() , qo.getCode(), qo.getGicEnterpriseId());
+            user = getUserByCode(wxEnterpriseId , qwDTO.getMemberCorpid() , qo.getCode(), qo.getGicEnterpriseId());
             if (user == null) {
                 logger.info("登录失败,从微信获取用户信息失败");
                 return resultResponse(HaoBanErrCode.ERR_6);