corpid

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java

@@ -16,12 +16,21 @@ public class WxEnterpriseQwDTO implements Serializable {
     private String memberSuiteId;
     // 第三方
     private String thirdCorpid;
+    // 明文的corpid
+    private String selfCorpid ;
     
     // 第三方使用的加密的userid
     public boolean needOpenUserId3th() {
         return this.wxSecurityType == 2 || this.wxSecurityType == 3;
     }
+    
+    public String getSelfCorpid() {
+        return selfCorpid;
+    }
 
+    public void setSelfCorpid(String selfCorpid) {
+        this.selfCorpid = selfCorpid;
+    }
     public String getDkSuiteId() {
         return dkSuiteId;
     }

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

@@ -77,6 +77,11 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
                 }
             });
         }
+        if(StringUtils.isBlank(qw.getMemberCorpid())) {
+            logger.info("会员小程序是自建");
+            qw.setMemberCorpid(wxEnterprise.getWxCorpid());
+        }
+        qw.setSelfCorpid(wxEnterprise.getWxCorpid());
         logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
         return qw;
     }

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

@@ -325,7 +325,7 @@ public class WxEnterpriseController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         wxSecretKey = wxSecretKey.trim();
-        String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getDkCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login.getStaffId(), qwDTO));
+        String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getDkCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login.getStaffId(), qwDTO , true));
         logger.info("【保存联系人key】res={}", res);
         SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
         if (null == secretSetting) {
@@ -367,7 +367,7 @@ public class WxEnterpriseController extends WebBaseController {
             secretSetting = new SecretSettingDTO();
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
-        UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getMemberCorpid(), memberSecret, getWxUserId(wxEnterpriseId, login.getStaffId(),qwDTO));
+        UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getMemberCorpid(), memberSecret, getWxUserId(wxEnterpriseId, login.getStaffId(),qwDTO , false));
         secretSetting.setSecretType(SecretTypeEnum.MEMBER_WAPP.getVal());
         secretSetting.setSecretName(secretName);
         secretSetting.setEnterpriseId(enterpriseId);
@@ -385,7 +385,7 @@ public class WxEnterpriseController extends WebBaseController {
         }
     }
 
-    private String getWxUserId(String wxEnterpriseId, String staffId,WxEnterpriseQwDTO qwDTO) {
+    private String getWxUserId(String wxEnterpriseId, String staffId,WxEnterpriseQwDTO qwDTO , boolean selfFlag) {
         StaffDTO statff = null ;
         if(StringUtils.isBlank(staffId)) {
             statff = this.staffApiService.getWxStaffOne(wxEnterpriseId) ;
@@ -396,6 +396,9 @@ public class WxEnterpriseController extends WebBaseController {
         if(null == statff) {
             return null ;
         }
+        if(selfFlag) {
+            return statff.getWxUserId(); 
+        }
         if(qwDTO.needOpenUserId3th()) {
             return statff.getWxOpenUseId() ;
         }else {