会员小程序关联多个企微兼容

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

@@ -67,16 +67,7 @@ public class SecretSettingServiceImpl implements SecretSettingService {
             logger.info("会员小程序配置使用getMemberSecretSetting接口");
             return null;
         }
-        //兼容好办助手和代开发
-        TabSecretSetting secretSetting = null;
-        if (secretType == SecretTypeEnum.CUSTOMIZED_APP.getVal()) {
-            secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
-            if (secretSetting == null) {
-                secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal(), null);
-            }
-        } else {
-        }
-        secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
+        TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
         return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
     }
 

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

@@ -350,6 +350,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
                 logger.info("登录失败,从微信获取用户信息失败");
                 return resultResponse(HaoBanErrCode.ERR_6);
             }
+            if (!user.getCorpId().equals(enterpriseDTO.getCorpid()) && !user.getCorpId().equals(enterpriseDetailDTO.getOpenCorpid())) {
+                logger.info("corpid不一致");
+                return resultResponse(HaoBanErrCode.ERR_500003, user.getCorpId());
+            }
             WxApplicationDTO wxApplicationDTO = wxApplicationApiService.selectByCorpid(user.getCorpId());
             WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxApplicationDTO.getWxEnterpriseId());
             if (wxEnterpriseDTO == null) {