区分加密不加密userid

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.getThirdCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login));
+        String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getThirdCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login,qwDTO));
         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));
+        UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getMemberCorpid(), memberSecret, getWxUserId(wxEnterpriseId, login,qwDTO));
         secretSetting.setSecretType(SecretTypeEnum.MEMBER_WAPP.getVal());
         secretSetting.setSecretName(secretName);
         secretSetting.setEnterpriseId(enterpriseId);
@@ -385,16 +385,19 @@ public class WxEnterpriseController extends WebBaseController {
         }
     }
 
-    private String getWxUserId(String wxEnterpriseId, WebLoginDTO loginDTO) {
+    private String getWxUserId(String wxEnterpriseId, WebLoginDTO loginDTO,WxEnterpriseQwDTO qwDTO) {
         if (loginDTO != null && (!StringUtils.isEmpty(loginDTO.getStaffId()))) {
             String staffId = loginDTO.getStaffId() ;
             StaffDTO dto = this.staffApiService.selectById(staffId) ;
-            if(null != dto && StringUtils.isNotBlank(dto.getStaffId())) {
-                return dto.getWxUserId();
+            if(null != dto) {
+                if(qwDTO.needOpenUserId3th()) {
+                    return dto.getWxOpenUseId() ;
+                }else {
+                    return dto.getWxUserId();
+                }
             }
         }
-        StaffDTO staffOne = staffApiService.getWxStaffOne(wxEnterpriseId);
-        return staffOne.getWxUserId();
+        return null ;
     }
 
     /**