Merge branch 'master_xgh_博格瑞绝色bug' into 'master_xgh_pendingid'

Master xgh 博格瑞绝色bug

See merge request !282

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

@@ -298,8 +298,15 @@ public class StaffApiServiceImpl implements StaffApiService {
         if(qwDTO.getWxSecurityType()==4) {
             list = qywxUserApiService.useridToOpenuserid(qwDTO.getThirdCorpid(), config.getWxSuiteid(), Collections.singletonList(userId));
         }else {
-            SecretSettingDTO set = this.secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(),  SecretTypeEnum.CUSTOMIZED_APP.getVal()) ;
-            list = qywxUserApiService.getSelfUseridToOpenuserid(qwDTO.getDkCorpid(), set.getSecretVal() , Collections.singletonList(userId));
+            // 绝色这类商户在2个服务商,在2023516要切换调
+            Object o = RedisUtil.getCache("bgrjswxEnterpriseId") ;
+            if(null != o && o.toString().contains(qwDTO.getWxEnterpriseId())) {
+                logger.info("绝色同步通讯录");
+                list = qywxUserApiService.useridToOpenuserid(qwDTO.getThirdCorpid(), config.getWxSuiteid(), Collections.singletonList(userId));
+            }else {
+                SecretSettingDTO set = this.secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(),  SecretTypeEnum.CUSTOMIZED_APP.getVal()) ;
+                list = qywxUserApiService.getSelfUseridToOpenuserid(qwDTO.getDkCorpid(), set.getSecretVal() , Collections.singletonList(userId));
+            }
         }
         logger.info("明文userId转密文={},{}",userId , JSON.toJSONString(list));
         if (CollectionUtils.isEmpty(list)) {