企微自建转代开发调整

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

@@ -83,7 +83,8 @@ public class WxEnterpriseController extends WebBaseController {
     private SecretSettingApiService secretSettingApiService ;
     @Autowired
     private ClerkService clerkService;
-
+    @Autowired
+    private WxApplicationApiService wxApplicationApiService ;
     //授权企业列表
     @RequestMapping("wxa-enterprise-list")
     public HaobanResponse wxEnterpriseList() {
@@ -163,10 +164,16 @@ public class WxEnterpriseController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
-        if(qwDTO.isSelf()) {
+        if(qwDTO.isSelf() && StringUtils.isNotBlank(qwDTO.getUrlHost())) {
             return this.fail("已刷新");
         }
-        QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid());
+        QywxCorpInfoDTO dto = null ;
+        if(qwDTO.getWxSecurityType()==6) {
+            WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,3);
+            dto = qywxTokenManageService.getCorpInfo(qwDTO.getThirdCorpid(), application.getSiteId());
+        }else {
+            dto = qywxTokenManageService.getCorpInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid());
+        }
         if (dto == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }