fix:兼容好办助手和代开发

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

@@ -284,21 +284,16 @@ public class WxEnterpriseController extends WebBaseController {
         String wxEnterpriseId = "";
         LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
         wxEnterpriseId = login.getWxEnterpriseId();
-        WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
         List<SecretSettingDTO> listSecret = wxEnterpriseApiService.listSecret(wxEnterpriseId);
         if (CollectionUtils.isEmpty(listSecret)) {
             return resultResponse(HaoBanErrCode.ERR_1, false);
         }
-        Set<Integer> secretTypeList = listSecret.stream().filter(secretSettingDTO -> {
-            return secretSettingDTO.getCheckFlag() == 1;
-        }).map(secretSettingDTO -> {
-            return secretSettingDTO.getSecretType();
-        }).collect(Collectors.toSet());
-
+        Set<Integer> secretTypeList = listSecret.stream().filter(secretSettingDTO -> secretSettingDTO.getCheckFlag() == 1).map(secretSettingDTO -> secretSettingDTO.getSecretType()).collect(Collectors.toSet());
         if (CollectionUtils.isEmpty(secretTypeList)) {
             return resultResponse(HaoBanErrCode.ERR_1, false);
         }
-        if (secretTypeList.contains(SecretTypeEnum.HAOBAN_HELP.getVal()) && secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal())) {
+        if ((secretTypeList.contains(SecretTypeEnum.HAOBAN_HELP.getVal()) || secretTypeList.contains(SecretTypeEnum.CUSTOMIZED_APP.getVal()))
+                && secretTypeList.contains(SecretTypeEnum.CONTACT_CUSTOMER.getVal())) {
             return resultResponse(HaoBanErrCode.ERR_1, true);
         } else {
             return resultResponse(HaoBanErrCode.ERR_1, false);