feat：还原设置通讯录set

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

@@ -280,9 +280,8 @@ public class WxEnterpriseController extends WebBaseController {
     //微信企业是否设置key
     @RequestMapping("is-wx-enterprise-secret-set")
     public HaobanResponse isWxEnterpriseSecretSet() {
-        String wxEnterpriseId = "";
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        wxEnterpriseId = login.getWxEnterpriseId();
+        String wxEnterpriseId = login.getWxEnterpriseId();
         List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId);
         if (CollectionUtils.isEmpty(listSecret)) {
             return resultResponse(HaoBanErrCode.ERR_1, false);
@@ -299,15 +298,18 @@ public class WxEnterpriseController extends WebBaseController {
         }
     }
 
-    //微信企业绑定接口绑定通讯录key
+    /**
+     * 微信企业绑定接口绑定通讯录key
+     * @param contactSecret
+     * @return
+     */
     @RequestMapping("wx-enterprise-contact-secret-set")
     public HaobanResponse wxEnterpriseSecretSet(String contactSecret) {
         if (StringUtils.isBlank(contactSecret)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        String wxEnterpriseId = "";
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        wxEnterpriseId = login.getWxEnterpriseId();
+        String wxEnterpriseId = login.getWxEnterpriseId();
         WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (wxEnterprise == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
@@ -334,27 +336,27 @@ public class WxEnterpriseController extends WebBaseController {
             wxEnterpriseApiService.saveSecretSetting(secretSetting);
             return resultResponse(HaoBanErrCode.ERR_10013);
         }
-
     }
 
-    //微信企业绑定接口绑定通讯录key
+    /**
+     * 微信企业绑定接口绑定通讯录key
+     * @param wxSecretKey
+     * @return
+     */
     @RequestMapping("wx-enterprise-wx-secret-set")
     public HaobanResponse wxEnterpriseWxSecretSet(String wxSecretKey) {
         if (StringUtils.isAnyBlank(wxSecretKey)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        String wxEnterpriseId = "";
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        wxEnterpriseId = login.getWxEnterpriseId();
+        String wxEnterpriseId = login.getWxEnterpriseId();
         WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (wxEnterprise == null) {
             return resultResponse(HaoBanErrCode.ERR_10012);
         }
         wxSecretKey = wxSecretKey.trim();
-        //String res = qywxUserApiService.listSelfExternalUserid(wxEnterprise.getCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login.getStaffDTO()));
-        //logger.info("【保存联系人key】res={}", res);
-
-        // TODO: 2021/12/21 先去除校验，流程能走下去
+        String res = qywxUserApiService.listSelfExternalUserid(wxEnterprise.getCorpid(), wxSecretKey, getWxUserId(wxEnterpriseId, login.getStaffDTO()));
+        logger.info("【保存联系人key】res={}", res);
         SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal(), null);
         if (null == secretSetting) {
             secretSetting = new SecretSettingDTO();
@@ -369,7 +371,13 @@ public class WxEnterpriseController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, true);
     }
 
-    //微信企业会员小程序
+    /**
+     * 微信企业会员小程序
+     * @param memberSecret
+     * @param enterpriseId
+     * @param secretName
+     * @return
+     */
     @RequestMapping("wx-enterprise-member-secret-set")
     public HaobanResponse wxEnterpriseMemberSecretSet(String memberSecret, String enterpriseId, String secretName) {
         if (StringUtils.isAnyBlank(memberSecret)) {
@@ -419,7 +427,12 @@ public class WxEnterpriseController extends WebBaseController {
         return staffOne.getWxUserId();
     }
 
-    //微信企业绑定接口绑定通讯录key(好办助手)
+    /**
+     * 微信企业绑定接口绑定通讯录key(好办助手)
+     * @param contactSecret
+     * @param memberSecret
+     * @return
+     */
     @RequestMapping("wx-enterprise-haoban-secret-set")
     public HaobanResponse wxEnterpriseHaobanSecretSet(String contactSecret, String memberSecret) {
         if (StringUtils.isNotBlank(memberSecret)) {
@@ -457,11 +470,13 @@ public class WxEnterpriseController extends WebBaseController {
             wxEnterpriseApiService.saveSecretSetting(secretSetting);
             return resultResponse(HaoBanErrCode.ERR_10013);
         }
-
     }
 
 
-    //微信企业会员小程序
+    /**
+     * 企微相关密钥列表
+     * @return
+     */
     @RequestMapping("secret-list")
     public HaobanResponse secretList() {
         String wxEnterpriseId = "";